Bazaar

  1. Bug #152008
  2. Comment #6

Comment 6 for bug 152008

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 152008] Re: Ability to unmerge or revert a merge sensibly

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

Alexander Belchenko wrote:
>> bzr merge ../mainline
>> bzr revert . # Remove the 'remove feature' changes
>
> I'm not sure about last 2 commands. AFAIK, revert will remove pending merge,

No, not "revert .". Revert with no arguments will clear pending merges,
but if filenames are specified, revert will not clear pending merges.

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

iD8DBQFHD8sP0F+nu1YWqI0RAq63AJ9XiZZqXYUnsW6Z+K68ITPHTN9PFwCeO4qx
1REbdae8wio+oAgICOL9oh4=
=bY46
-----END PGP SIGNATURE-----