bzr merge usability tweakage

[Aaron Bentley]

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

William Dodé wrote:
| What do you think about an option to can keep the
| changes somewhere when we revert ?
| bzr revert --keep my.patch

Hmm.  What about taking a snapshot?  Patches implicitly depend on the
current tree state, so they can become worthless if you change the tree
state too much.  They also don't store every kind of data (e.g.
binaries, file renames).  With snapshots, you can always produce diffs
later, but you can't manipulate snapshots with your standard commandline
tools, as you can with diffs.

We *could* take a snapshot before any command that manipulates the tree,
in fact.  Then it would be safe to do merge with uncommitted changes
present, because you could just undo.

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

iD8DBQFClxvF0F+nu1YWqI0RAnELAJ0e1GReUO99AzNtrTbNxlFd7jmi6QCffJfw
2LHdkN0tmp0HCEN6+ijgS0k=
=j6b4
-----END PGP SIGNATURE-----