În data de Duminică 27 Decembrie 2009 06:35:51 pm ați scris:
2009/12/27 bulia byak <buliabyak@...400...>:
On Sun, Dec 27, 2009 at 8:35 AM, Arcadie M. Cracan <acracan@...400...>
wrote:
I don't really know how I've managed to do this (bzr still seems a bit complicated to me) but I think the current revision is an outdated one. Please revert my today (Dec 27) commits.
Judging by http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/files, we also lost a lot of recent revisions :(
I think we didn't. The only thing that happened is that Arcadie apparently committed something that had a lot of obsolete files that somehow were regarded as locally changed. I am guessing that he didn't originally branch from lp:inkscape, because if he did, he would be warned about diverged branches; or that he went back to a previous revision by copying a different working tree over the branch.
Arcadie: to fix this, run "bzr uncommit", it should undo the changes from the fatal rev. 8859. If you want to undo more than the last commit, supply a revision to revert to with the -r parameter. Then describe what exactly did you do with your branch (I'm guessing that you started from an SVN working copy, so provide the details of how did you migrate to Bazaar).
I started with a local branch of lp:inkscape and then merged locally my gsoc work, and then pushed it back. What I did today was: - change some files - bzr commit - bzr merge - bzr push
I think the order of the commands should have been: - bzr merge - bzr commit - bzr push
Anyways, it seems strange to me that the revision number has changed and that all those subsequent commits became subrevisions.
Regards, Arcadie