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

[Aaron Bentley]

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

Aaron Bentley wrote:
| | * I don't think I understand you (Aaron) when you say "'unshelve' will
| restore
| | the tree to the state it was in when you issued the 'shelve' command" -
| | because I *don't* want it to do that. I want to shelve some stuff,
| maybe edit
| | something, commit, make more changes .. blah, then unshelve and keep
| working.

Okay, I've thought about this some more, and I think we can satisfy both
~ cases pretty well by using the latest common ancestor as the merge
BASE, instead of using the working tree.  So:

$ bzr revno
43
$ bzr shelve
[snpshot S1-960-57 created.]
$ vi megafile
[ remove some changes, adjust others, add new changes]
$ bzr commit
$ bzr unshelve
[this will actually do a merge with OTHER=S1-960-57 and BASE=revno 43]

If, after shelving, you make changes to code you changed before
shelving, then unshelving will produce conflicts, and you'll have to
sort it out by hand.

Aaron

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

iD8DBQFClx9/0F+nu1YWqI0RAh2HAJ9LwzKTZwXlznHPlWPoYA8zj+lYUACfXBP+
MT2Em0On2UIC9K0lhM3M9KI=
=T6cv
-----END PGP SIGNATURE-----