I'm not sure that everyone knows how to uncommit from GTG, so I'll just drop a note:
bzr uncommit (to uncommit for your branch) bzr push --overwrite --no-strict (to force Launchpad to forget about commits which are not in your branch, --no-strict is to avoid being stopped by the presence of not committed modifications to the code. You can use bzr revert before this command if you want to avoid --no-strict) To check for lost commits: bzr pull bzr missing Night! On Mon, May 24, 2010 at 12:27 AM, Bryce Harrington <[email protected]> wrote: > I've mostly fixed it. I fortunately had a recent copy of the tree from > rev 758. I've merged recent changes onto it and pushed, which restores > this history up until 758. It messes the numbers to two of Luca's > recent commits and a bunch of mine but that seems to be about it. > > On Sun, May 23, 2010 at 02:50:59PM -0700, Bryce Harrington wrote: >> Sorry, yes it was my mistake. I did merge to trunk beforehand but >> didn't realize it would mess up the history; can it be undone? >> >> On Sun, May 23, 2010 at 11:44:27PM +0200, Lionel Dricot wrote: >> > Hi people, >> > >> > >> > There has been a big problem with the trunk : someone accidentally >> > pushed his own branch instead of the trunk. It looks like it's you, >> > Bryce (but I'm not 100% sure). >> > >> > This should not happen and, if it cannot be corrected, at least it >> > should be reported immediately to the dev list. I'm concerned both by >> > the fact that it happens and that nobody seems to care about it. Maybe >> > I'm missing something here. >> > >> > In fact, I don't understand why bazaar allows that kind of behavior >> > which looks like it would allow some data loss. (and I don't know how >> > you, guys, can do this. I have no idea on how to do it. Bzr would tell >> > me that branches have diverged and that I cannot push) >> > >> > Please take care in the future, >> > >> > Thanks, >> > >> > Lionel >> > >> > PS: even if there's no code loss with the current error, the fact is >> > that : >> > >> > 1) it's hard to prove that there was no code loss >> > 2) it's nearly impossible to retrace the history >> > 3) you loose every relation to where a given bug was fixed >> > 4) Every current copy of the trunk become suddenly incompatible with the >> > trunk, which is highly annoying. >> > >> > >> > PPS: I don't want to point anyone or anything. If it's a mistake (which >> > happens), it is anyway already done, I only want to be sure that it >> > doesn't happen again in the future. If it's something that I don't >> > understand, please explain me ;-) >> > >> > >> > _______________________________________________ >> > Mailing list: https://launchpad.net/~gtg-contributors >> > Post to : [email protected] >> > Unsubscribe : https://launchpad.net/~gtg-contributors >> > More help : https://help.launchpad.net/ListHelp >> >> _______________________________________________ >> Mailing list: https://launchpad.net/~gtg-contributors >> Post to : [email protected] >> Unsubscribe : https://launchpad.net/~gtg-contributors >> More help : https://help.launchpad.net/ListHelp > > _______________________________________________ > Mailing list: https://launchpad.net/~gtg-contributors > Post to : [email protected] > Unsubscribe : https://launchpad.net/~gtg-contributors > More help : https://help.launchpad.net/ListHelp > _______________________________________________ Mailing list: https://launchpad.net/~gtg-contributors Post to : [email protected] Unsubscribe : https://launchpad.net/~gtg-contributors More help : https://help.launchpad.net/ListHelp
