[MERGE] followup, uncommit saves pending-merges #31426

[John Arbash Meinel]

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

Since I was working on uncommit, the attached bundle is an addendum
(though the feature fix is independent).

This makes it so that this workflow is possible:
	bzr merge ../foo
	bzr commit -m 'buggy'
	# ooops
	bzr uncommit
	# fix up something
	bzr commit -m 'good'

The uncommit now keeps track of what pending merges have been crossed,
and adds them in the end.
So if you did:

cd bzr.dev
bzr uncommit -r 1

You end up with a tree with 382 pending merges. (Some of them
duplicated, we merged the 'A' revision twice :)

Within these two changes, I also switched to using Aaron's updated log
work. So now printing out the list of revisions to be uncommitted is
*much* faster.

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

iD8DBQFEtBZBJdeBCYSNAAMRArqSAKCh7r9PA2KjPL/mnNYC8RNrjd7mgQCfbX/S
nDA6HoT4LQHu9YBTFkHFKpg=
=MNdW
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: uncommit-saves-merges.patch
Type: text/x-patch
Size: 7944 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060711/ed4d6a03/attachment.bin