[rfc] remove foo.bar; add foo.bar -> make this no-op?

Aaron Bentley aaron.bentley at utoronto.ca
Fri Sep 15 13:01:59 BST 2006


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> John Arbash Meinel пишет:
> $ hack-hack foo.bar
> $ bzr remove foo.bar  # Ooops! It's mistake! I don't want this!!!
> $ bzr revert foo.bar  # all changes in foo.bar lost

No, the the changes you made are kept in foo.bar.~1~

> So before revert I need to save current foo.bar in some place and then
> restore content after revert. And merge history for foo.bar will be
> preserved? It's right?

Actually, because you changed foo.bar's content, when you revert
foo.bar, it will move the current content of foo.bar into foo.bar.~1~.

So you can just do
$ bzr revert foo.bar
$ mv foo.bar.~1~ foo.bar

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFCpY30F+nu1YWqI0RAicfAJ962Pf2HbfSO/+6ZKjFCYwWQFLyrQCcCopz
33ZBBoVipADzbltlXLAOyYg=
=14qA
-----END PGP SIGNATURE-----




More information about the bazaar mailing list