-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 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. right now I see this: $ bzr info Standalone tree (format: dirstate) Location: ~ branch root: . Related branches: ~ parent branch: http://bzr.xsteve.at/dvc/ $ bzr up Tree is up to date at revision 302. $ bzr merge Merging from remembered location http://bzr.xsteve.at/dvc/ Nothing to do. $ bzr remerge All changes applied successfully. $ bzr st unknown: ~ e21/ ~ e23/ ~ info/ pending merges: ~ Stefan Reichoer 2008-01-06 Merged the dvc file-info branch from Stephen L... $ the unknown directories are OK. what I am worried about is the "pending merges". 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. thanks. Sam. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHg73ZPp1Qsf2qnMcRAiO+AJ0ZyKmWGz8WrqJM5zUBRAMQc97GlQCfSJU4 18r5duxRp5790BUhsZA8aY4= =7DHG -----END PGP SIGNATURE----- _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
