[15:38] <erry> Hi
[15:38] <erry> I accidentally committed into thhe wrong branch
[15:38] <erry> how can  i undo it before i get fired?
[15:38] <LeoNerd> uncommit ?
[15:39] <erry> i don't want to make it any worse D:
[15:42] <Peng> "bzr uncommit" removes the most recent commit(s) from a branch, but it doesn't expunge the data from the repository, so you're still in trouble if this was the nuclear launch codes.
[15:43] <erry> it's ok, i got a colleague to do it
[15:43] <erry> (RIP erry'#s career, 2016-05-27 - 2016-06-06 :()
[15:43] <Peng> RIP humanity, if you launched the nuclear weapons
[15:43] <fullermd> To launch the nukes?  Man, I need more fun coworkers.
[17:01] <grewalkamal> Hi I am new to bzr. I am working on a project to which I do not have direct push access. I created my own development branch to work upon. Now when I pull the changes from the main trunk branch, the revision id there is say 101. And I did my last commit at revision 90. Now pulling the changes upto revision id 101, when I merge the trunk to my branch and push the changes, the revision id I get for my branch is 90 instead of 102.
[17:02] <grewalkamal> *revision id I get for my brnach is 91
[17:02] <grewalkamal> Will the revision ids synchronize once my changes are merged in the repo?
[17:11] <fullermd> The question isn't really meaningful.  revids are a branch-local construct; there's nothing to synchronize.
[17:15] <grewalkamal> Okay
[17:16] <grewalkamal> Being a newbie, I considered my branch revision id will be same after I merge changes from the upstream.
[17:16] <grewalkamal> Same with revision id of trunk.
[17:16] <fullermd> Mmph.  Sorry, I got lead into fuzzy expression.
[17:17] <fullermd> The revision _id_ is; that's nailed to the revision and stays with it forever.  The revision _number_ isn't, that's potentially going to differ depending on what branch it's in.
[17:18] <grewalkamal> Yh now it looks like fuzzy to me too. Well the difference is anyhow clear.
[17:18] <grewalkamal> Thanks.
[17:23] <fullermd> http://wiki.bazaar.canonical.com/MatthewFuller/SpotDocs/RevNumbering  may help a little
[17:29] <grewalkamal> Helped. :-)
[17:30] <fullermd> So, "90" could mean pretty much any commit anybody ever made on any project anywhere.  But "foo@bar.com-2016060612345678..." will always refer to exactly one revision.
[17:31] <fullermd> It's just a giant PITA to type or tell someone or remember.  Hence, the number, which works OK as long as you're both talking about the same branch.
[17:33] <grewalkamal> Yep. These numbers are local to branches I believe now.
[17:33] <grewalkamal> Thank you once again fullermd
[17:34] <fullermd> 's what I here for   :)
[17:34] <fullermd> I mean, that, and smartass comments.  But I need another cup of coffee before I'm in top form for that, so...
[17:36] <grewalkamal> :-)
=== Guest40887 is now known as fredp
=== fredp is now known as Guest93815