23:14 < j1mc> hello, i've kind of goofed up my bzr history on the bzr repository/server. i didn't do a bzr bind, and several other people committed changes that i just merged in, and then pushed up a few of my changes. the content is accurate, but the history is fscked. is there a way to fix/correct the history?
23:15 < poolie> what do you want it to look like?
23:15 < j1mc> i want the prior history to be shown. 108 revisions were removed from the branch, and replaced by my generic 'a bunch of updates' commit messages.
23:16 < j1mc> :(
23:16 < lifeless> j1mc: sure thing, what you need to do is do 'bzr branch -r revid:XXX trunk local; cd local; bzr merge -r revid:YYYY ../trunk; bzr commit; bzr push --overwrite ../trunk'
23:16 < j1mc> lifeless, can you please explain to me what that will do?
23:16 < lifeless> j1mc: where XXX is the revision id (not revision number) of the last commit that should have been on the mainline before you pushed
23:16 < j1mc> (thanks, btw)
23:17 < lifeless> j1mc: and YYY is the revision id of the tip of your branch (possibly even the current mainline tip)
23:17 < lifeless> j1mc: what it will do is do the merge that bind would have done via 'bzr update'
23:18 < lifeless> j1mc: you can get revision ids via bzr log --show-ids
23:18 < j1mc> lifeless: this is on launchpad, will it cause 108 emails to be sent out with the updated revision history
23:18 < j1mc> s/updated/corrected
23:18 < lifeless> j1mc: presumably :(. thumper ^
23:19 < j1mc> haha
23:19 < lifeless> after you ahve done this
23:19 < lifeless> there is an option you can turn on in your branch to prevent this mistake
23:19 < lifeless> its in the manual I believe