[00:00] <chx_> see the problem is that there are conflicts in earlier which go away later
[00:00] <chx_> but dont worry
[00:00] <chx_> i can do a few manually
[00:01] <dash> chx_: wanting to pull in a bunch of random revisions like that is a sign you're going to suffer no matter what :)
[00:01]  * chx_ suffers.
[00:01] <dash> how did this happen?
[00:01] <chx> dont ask.,
[00:01] <dash> oh well too late
[00:01] <chx> i have exceptionally talented co-workers
[00:01] <dash> Heh
[00:01] <dash> so do the people in my office... ;)
[00:01] <chx> they got their pink slips already worry not
[00:02] <chx> i am just cleaning up the mess
[00:02] <chx> this is what happens when you hire so many people for a huge project in such a short tim
[00:02] <chx> you get good people... and some only good in destruction
[00:02] <bialix> lol
[00:03] <chx> some ppl managed to play so nice tricks with a combination of switch, bind and unbind that if you just merge in their branch then trunk changes get reverted
[00:04] <chx> so i need to cherrypick the revisions that actually make progress
[00:06] <chx> mmmm merge -i
[00:07] <chx> is it going to tell me that applying something would end up in a conflict?
[00:08] <chx> oh it DOES
[00:09]  * chx hugs merge -i
[00:12]  * TresEquis wishes he could give pink slips to a couple of OSS community members
[01:42] <Peng_> jam: Which view is broken?
[06:19] <Peng_> jam: FWIW, I just merged history_db into your integration branch, fixed some conflicts, and pushed it to lp:~mnordhoff/loggerhead/jam-integration
[06:20]  * Peng_ dies of conflictitis
[15:46] <deviantintegral> anyone here using bzr-svn on OS X? It doesn't look to be saving SVN credentials, so it asks for a password for every HTTPS operation.
[17:53] <deviantintegral> anyone have a good link to an explanation of why you need bzr join/split?
[17:54] <maxb> Because sometimes you want merge two projects into one, or split one project into two?
[17:55] <deviantintegral> maxb: ok. so right now I'm dealing with a vendor branch. With SVN, an svn cp is enough, but a bzr branch within an existing branch is more like an svn:external?
[17:56] <maxb> A bzr branch within a bzr branch is most like checking one unrelated svn working copy out within another
[17:57] <deviantintegral> maxb: awesome, thanks, exactly what I was looking for
[17:57] <maxb> it is? That's a cumbersome way to work
[17:58] <maxb> Mainly because it means each person has to branch all the branches and arrange them locally manually
[18:00] <deviantintegral> perhaps I'm not explaining it properly - the directions I have are http://pastebin.com/9zCPAHhx
[18:00] <deviantintegral> but if there's a better way to do it, I'd be curious to know
[18:02] <fullermd> 'join' is just a little syntactic sugar around 'merge'.
[18:03] <deviantintegral> so I could do the same thing by doing a bzr merge into my tree
[18:03] <deviantintegral> that makes sense
[18:03] <fullermd> Plus a little extra work to move the 'root' of that new tree off to where you want it, yes.
[18:04] <fullermd> You'll use merge to get later updates.
[18:05] <deviantintegral> nice
[18:39] <mathrick> jelmer: hi
[18:39] <mathrick> mathrick@hatsumi:~/elisp/dist$ bzr get http://github.com/remvee/android-mode.git
[18:39] <mathrick> bzr: ERROR: HTTP Error 406: Not Acceptable
[18:39] <mathrick> what gives?
[18:39] <mathrick> also I got a crasher when I try to get the same via git+ssh://
[18:50] <mathrick> woah there: http://pastebin.com/7h1rLN6q
[18:50] <mathrick> that looks bad
[18:51] <mathrick> bah, it's my ~/Dev/ shared repo acting up again
[18:51] <mathrick> I hate it
[18:51] <fullermd> Oh yeah?!  Well, it hates you too!
[18:51] <mathrick> heh
[18:52] <mathrick> well, I don't make its life miserable, so it has no reason to
[18:53] <fullermd> Did you remember its birthday?
[18:53] <mathrick> :)
[18:57] <TresEquis> mathrick: send it some flowers
[18:57] <TresEquis> or maybe chocolates
[19:09] <jelmer> mathrick: hi
[19:09] <mathrick> jelmer: hey
[19:10] <mathrick> I updated bzr-git, and the difference is that now it stalls and does nothing instead of erroring out
[19:11] <jelmer> mathrick: which repo are you trying to fetch?
[19:11] <mathrick> http://github.com/remvee/android-mode.git
[19:13] <jelmer> bzr.dev branch git://github.com/remvee/android-mode.git
[19:13] <jelmer> works fine here
[19:13] <mathrick> hmm
[19:13] <mathrick> well, I'll assume it's something wrong with 2.1 then
[19:16] <jelmer> mathrick: are you fetching over git:// or http://
[19:18] <mathrick> jelmer: http://
[19:18] <mathrick> with git:// it works fine
[19:20] <jelmer> mathrick: http:// is really really slow for git
[19:21] <mathrick> jelmer: I just used it because that was what github gave me by default
[19:27] <jelmer> mathrick:  this is a github issue I think, e.g. try accessing http://github.com/remvee/android-mode.git/info/refs.
[19:28] <mathrick> jelmer: loads OK in the browser
[19:29] <lifeless> hai
[19:29] <mathrick> jelmer: btw, did you have the time to look into that bug with bzr-git getting confused if it's pointed at a URL with .git's content at the toplevel?
[19:29] <jelmer> lifeless: hey
[19:29] <mathrick> that is, bzr: ERROR: Not a branch: "http://common-lisp.net/project/parenscript/git/parenscript/"
[19:29] <jelmer> mathrick: doesn't work here..
[19:30] <mathrick> jelmer: interesting
[19:30] <mathrick> then it's probably github being at fauly
[19:30] <mathrick> *fault
[19:30] <jelmer> mathrick: Is there a bug about that?
[19:30] <mathrick> nope, I just poked you in here, but then got distracted and forgot to file it
[19:30] <mathrick> at least I don't think there is one
[19:39] <jelmer> mathrick: please file one, I don't remember everything people say to me on irc :-)
[19:39] <mathrick> you should :)
[19:39] <mathrick> but ok, will do
[21:35]  * digitalz Discounts!! Our Special Limited Time Offers Up To May,22!!!New BranD!! Notebooks,Plasma and LCD TV's.Buy your electronic needs at our unique prices. Laptop Sony VAIO® VGN-FW590FFD-575,57$!!!Apple MacBook® Air MC234LL/A-695,27$!!! http://www.elplace.com/
[22:00] <knittl> hi. is there an easy way to inspect bazaar's storage format?
[22:01] <Peng_> Inspect how?
[22:02] <Peng_> And...which one?
[22:02] <knittl> all of them. but good point, bazaar has changed its format several times
[22:02] <knittl> git has object with hashes as names, hg has debug*, i'm looking for the bzr counterpart
[22:03] <Peng_> knittl: dump-btree is nice for the btree-format indexes.
[22:04] <knittl> what path does it expect?
[22:04] <knittl> because . makes it crash :D
[22:05] <Peng_> knittl: A btree index file. Such as .bzr/repository/pack-names
[22:06] <knittl> i'll look into it. it's a good starting point. thank you
[22:07] <Peng_> LUNCH! /me vanishes in puff of smoke