Sam Steingold <[EMAIL PROTECTED]> writes: > Stefan Reichör wrote: > | Committed revision 302 to http://bzr.xsteve.at/dvc/ > | > | Merged from Stephen Leake: Misc minor improvements > > I seem to be unable to get this revision because of my incompetence with > bzr. > someone committed something to our local tree, and I seem to be unable > to cleanly undo that.
bzr uncommit if you want to get rid of it. > what I am worried about is the "pending merges". You're one commit ahead compared to Stefan, but you have all the changes that he has. So, a merge results in the same tree, but _if you want_, you can still create a new commit with yours and stephan's as ancestor, and still the same tree. > to be clear, what I want is an equivalent of "cvs up -C", i.e., get a > clean copy of the remote repo without any trace of any local changes. bzr switch can help here. -- Matthieu _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
