[00:56] <poolie> hi all
[01:00] <spiv> Hi poolie
[01:04] <poolie> i might catch up on my pilotage today
[01:04] <poolie> i got a bit further on feature flags yesterday
[03:27] <jdk2588> I am trying to merge from one branch to another branch and I am getting this error
[03:27] <jdk2588> http://pastebin.com/Hh522sk1
[03:34] <poolie> hi jdk2588, this means you, or someone else, has upgraded one of the repositories but not the other
[03:34] <poolie> if you're running bzr 2.0 or later i would recommend just using 'bzr upgrade' in both
[03:34] <poolie> it may take a while if the repo is large
[03:37] <jdk2588> I am using bzr 1.9
[03:40] <poolie> ok
[03:40] <poolie> i'd recommend that you upgrade then
[03:40] <poolie> what OS are you using?
[03:47] <jdk2588> Ubuntu 8.04
[04:01] <jdk2588> now I have upgraded but it shows an error that revisions have no common ancesstor
[04:02] <poolie> ok, and you're pretty sure these branches are in fact related?
[04:02] <jdk2588> yes , they
[04:02] <jdk2588> like if I try to merge branch2 into branch1 it works
[04:03] <jdk2588> but when branch1 into branch2 it shows now the ancesstor error
[04:03] <fullermd> Probably one of those criss-cross bugs.
[04:04] <fullermd> ...  though, that wouldn't be order dependent, I'd think...
[04:07] <fullermd> Does doing `missing` one way or the other reveal anything surprising?
[04:23] <jdk2588> yeah I was able to merge
[04:23] <jdk2588> thanks guys
[04:24] <jdk2588> ok now in the conflicts  what are the three files like <filename>.{BASE,THIS,OTHER}
[04:24] <jdk2588> can someone just help me with this
[04:24] <fullermd> That means there was a conflict in the file.
[04:25] <fullermd> Assuming it's a text file, you'll have "normal" CVS-ish conflict markers in the file itself, you can just resolve in place.  Those 3 files are there if you need to refer to them, or use an external 3-way tool.
[04:25] <jdk2588> so how should it be resolved , I did read the docs but  could not understand much
[04:25]  * fullermd shrugs.
[04:26] <fullermd> Pull it up and see what the conflict is.  Its presence means that bzr couldn't merge it automatically, so it'll have to be your human understanding of the code (or recipe, or whatever it is)
[04:27] <spiv> Hmm, the docs aren't very detailed on this.
[04:30] <spiv> jdk2588: the easiest way usually is to open the file, and look for "<<<<<<<"
[04:31] <spiv> jdk2588: which will be the start of the conflicting region
[04:31] <jdk2588> ok and I should remove it
[04:31] <jdk2588> ?
[04:32] <spiv> Or if you prefer you can use the BASE/THIS/OTHER files (which can work well if you use a tool like 'meld' to help)
[04:32] <spiv> Well, you should resolve it.
[04:32] <spiv> Basically, there are two different changes to the same region of the file.
[04:32] <spiv> And bzr can't apply both of them automatically, so it's up to you to figure out what the right result would be.
[04:33] <spiv> It might be to just take the THIS version, or the OTHER, or you might need to combine the differences somehow.
[04:33] <spiv> The right thing to do depends on the individual circumstances, which is why bzr can't just take care of it for you automatically.
[04:34] <jdk2588> ok got it
[04:34] <spiv> jdk2588: http://doc.bazaar.canonical.com/bzr.2.2/en/user-reference/conflict-types-help.html#text-conflicts
[04:34] <jdk2588> ok thanks for help and your link :)
[06:48] <m3ga> anyone have any ideas how I can recover from this problem : https://bugs.launchpad.net/ubuntu/+source/bzr/+bug/617224
[06:53] <spiv> poolie: can you help m3ga?  I think you have wt/dirstate issues more fresh in your mind than I do.
[06:54] <poolie> oh hi
[06:55] <m3ga> hi!
[06:56] <m3ga> bummer to happen last thing on a friday.
[06:56] <poolie> sorry about that
[06:56] <poolie> do you recall what you did leading up to this?
[06:56] <poolie> it looks like bug 373319
[06:57] <m3ga> bzr rm lib/oldxmlrpc
[06:57] <m3ga> which was a tree of about 10 files
[06:57] <poolie> nothing else?
[06:59] <m3ga> actually, the bzr rm was in a hardy chroot with the hardy version of bzr, but the hardy version screwed is so it remained screwed when i exited the chroot and ran the lucid bzr
[07:00] <m3ga> on hardy it was bzr 1.3.1
[07:00] <m3ga> that makes it a little more complicated doesn't it? :-)
[07:01] <poolie> it might be something already fixed since hardy
[07:02] <m3ga> get into the problem yes, but getting back out?
[07:02] <poolie> probably you should just make a new checkout,
[07:02] <poolie> eg by branching, and then moving that over the top
[07:02] <poolie> you might want to add the ~bzr ppa to your hardy chroot
[07:03] <m3ga> bzr branch broken broken.2 gets "bzr: ERROR: exceptions.AssertionError: Could not find target parent in wt: lib/oldxmlrpc"
[07:05] <spiv> poolie: tangentially, you might want to look at https://bugs.edge.launchpad.net/ubuntu/+source/bzr/+bug/264275, it appears your work on #192859 has almost fixed it.  I left a comment.
[07:06] <poolie> oh thanks spiv, when i eventually get back to prague i think a bunch more may be just about fixed
[07:07] <poolie> m3ga: could you paste the traceback into bug 373319?
[07:08] <m3ga> poolie: save traceback i posted in #617224?
[07:08] <m3ga> s/save/same/
[07:09] <poolie> no, from the error when branching
[07:09] <m3ga> ok will do
[07:12] <m3ga> done!
[07:14] <m3ga> basically my going home time now :-) will probably bug you about it some more on monday.
[07:26] <poolie> ok, have a good weekend
[08:29] <poolie> bialix, i'm working on bug 585667
[08:52] <jdk2588_> when I am merging from a different branch , I want that few files should not be merged
[08:52] <jdk2588_> because it creates a conflict by renaming the old file to <filename>.moved
[08:53] <jdk2588_> and when I rename the file <filename>.moved to the original file it shows original file to be removed
[09:04] <poolie> jdk2588_: probably the easiest thing is to just revert those files after the merge, before committing
[09:12]  * spiv feeds a branch to PQM and signs off for the weekend
[09:16] <spiv> G'night all, see you Monday.
[09:18] <poolie> cheerio spiv, have a good weekend
[10:34] <jdk2588_> poolie: there ?
[10:34] <poolie> hi
[10:34] <poolie> but not for much longer
[10:35] <jdk2588_> I was upgrading my launchpad branch for rich-root . but lost the connection
[10:35] <jdk2588_> now it is in unstable mode
[10:36] <jdk2588_> neither I can get the branch noe do anything
[10:37] <jdk2588_> poolie: can you just help with this
[10:37] <poolie> which branch?
[10:38] <jdk2588_> the branch in which I have to commit , lp:~systers-dev/systers/membership
[10:38] <poolie> if you have a copy of it locally it might be easiest to delete that and re-push?
[10:38] <jdk2588_> can't it be avoided ?
[10:39] <poolie> i mean delete it from the server, using the web ui, then re-push it
[10:39] <poolie> i'll have a look at it
[10:39] <jdk2588_> as other members are also subscribed to it
[10:39] <poolie> ah ok
[10:39] <jdk2588_> and I can not staright away delete it :)
[10:40] <jdk2588_> *straight
[10:40] <maxb> jdk2588_: There is a better option, to preserve subscriptions.
[10:40] <maxb> If there is no nicer way to fix it, you can delete the content of the branch using a sftp client, and bzr push --use-existing-dir
[10:41] <jdk2588_> wont it remove the subscribers
[10:41] <jdk2588_> ?
[10:42] <maxb> deleting it in the web UI would
[10:42] <maxb> jdk2588_: Are you familiar with the 'sshfs' command for mounting a remote sftp location as if it was part of the local filesystem ?
[10:42]  * jdk2588_ googles 'sshfs'
[10:42] <poolie> yes, what maxb said is probably best
[10:43] <jdk2588_> and how do I preserve the Subscribers
[10:43] <poolie> just for future reference, there is an 'upgrade' button in the web ui, i think
[10:43] <poolie> jdk2588_: if you just delete it over sftp not through the web ui, the subscribers will be preserved
[10:43] <maxb> I would recommend not deleting it at all. There is a better way
[10:43] <maxb> mkdir /tmp/mountpoint
[10:44] <jdk2588_> ok
[10:44] <maxb> sshfs bazaar.launchpad.net:~systers-dev/systers/membership /tmp/mountpoint
[10:44] <maxb> cd /tmp/mountpoint
[10:44] <maxb> mv .bzr backup.bzr.~1~
[10:44] <maxb> mv backup.bzr .bzr
[10:44] <jdk2588_> or one thinng I can do is to move backup.bzr to .bzr
[10:44] <jdk2588_> yes
[10:44] <maxb> cd /
[10:44] <jdk2588_> this is a good option
[10:44] <maxb> fusermount -u /tmp/mountpoint
[10:45] <jdk2588_> thanks maxb
[10:45] <jdk2588_> you saved my day :)
[10:46] <maxb> At that point, you should be able to access the branch with bzr again. The launchpad web UI may be a bit confused until you next do a bzr write operation on the branch (a no-op push will do)
[10:48] <jdk2588_> maxb: done ! Thanks
[10:48] <jdk2588_> :)
[10:50] <maxb> Ok! Now, on the branch's web page, you should see an "Upgrade" link. If you click it, Launchpad will upgrade the branch to 2a format at some point in the future (hopefully quickly)
[10:51] <jdk2588_> so will it upgrade the rich-root  for the branch ?
[10:52] <jdk2588_> yes I can see that "Upgrade this branch"
[11:40] <jdk2588_> is olive 0.11 is the latest version ?
[11:43] <jelmer> I don't think there really has been a release since it was split out.
[11:51] <zyga> hello, which plugin provides lp-propose-for merge command? I cannot find it anywhere and I keep remembering that other folks were using that often
[15:35] <dobey> if i have a WorkingTree object, how do add a new file to it from the python code?
[15:36] <jelmer> dobey: wt.add([path1, path2, path3])
[15:37] <dobey> ah, that easy eh? thanks
[18:24] <edakiri> Glossary is missing.  http://bazaar.canonical.com/BzrGlossary/
[18:25] <jelmer> edakiri, http://wiki.bazaar.canonical.com/BzrGlossary/
[18:26] <edakiri> thanks.  I hope the dead links get fixed.  I don't have commit privileges.
[18:34] <jelmer> edakiri: please file a bug about the dead link
[18:40] <edakiri> done
[20:26] <aaron01> If i try to bzr import a tarball that contains a .bzr dir, it fails with "error: tree transform is malformed" (related: https://bugs.launchpad.net/bzrtools/+bug/237933).
[20:48] <aaron01> nm read the merge date on that patch wrong. Thought I was getting error with patch.
[23:41] <jdk2588> how can we get a branch with older version ?
[23:42] <Meths> -r  to specify a revision
[23:42] <Meths> bzr help revisions