[Extension] Dirty hack of 'shelve' and 'unshelve' command

[Aaron Bentley]

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

Harri Salokorpi wrote:
> About partial shelving/unshelving: I think you practically have to rely on 
> external merge tool for this. Partial unshelving case should probably use the 
> shelved snapshot as base (i.e. do not even try to merge any branch changes to 
> snapshot before presenting the data to mergetool since there may be 
> conflicts).

What I'm saying is that yes, we can support that, but the commandline is
the ultimate merge tool, since it can invoke any other.

The goal of bzr isn't merely to be better than the competition, it's to
be 'a joy to use'.  I'd like people to be able to go back and review
their merging choices, right up to the point where they commit.  I'd
like them to be able to use several different tools, if they liked.

So I'd like shelve to provide an environment that makes commandline
merging relatively easy.  I think that would mean keeping the snapshot
around in some more concrete form.  Obviously, keeping a whole copy of
the working tree is a lot of work and space, but I don't know which
tools would accept a partial tree.

So this 'ultimate unshelve' is still baking, I think.

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

iD8DBQFCmKJ10F+nu1YWqI0RAiJtAKCHaRTZr0B/v1IKp37jnOFYQIs4uQCfcxKV
gLaEiIQmJJ9EglPVoMO3gXU=
=1AGN
-----END PGP SIGNATURE-----