[PATCH] cumulative merge patch

[John A Meinel]

Aaron Bentley wrote:

> This patch contains all the changes to merge that I'd like to get into
> 0.5, namely
> * common ancestor BASE selection
> * merge reports conflicts when they are encountered
> * merge refuses to operate in working trees with changes
> * introduces revert command to revert the working tree to the
> last-committed state
> * Adds some reasonable help text
>
> This patch is current as of revision 613.
>
> Aaron

One interesting aspect of my later patch for handling fancier revision
strings (date:, rev-id:, etc) is that it should actually automatically
update your merge code. So that you can do:

bzr merge ./@date:2005-05-12

The reason it works, is because branch.lookup_revision() does a lookup
into get_revision_info() based on the passed 'revision' parameter.

Anyway, I also agree that your merge code should be included. Even if my
stuff is not.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050603/85d70917/attachment.pgp