[MERGE] Cherrypick support for annotate merge

Robert Collins robertc at robertcollins.net
Wed Dec 19 23:08:43 GMT 2007



> This technique does not support reverse cherrypicking.  I don't
> currently have a theory of how weave merge could support that.
> 
> Aaron

I think you need to reverse everything.

y..x where x comes before y in the revision graph.

Reverse the graph - parents become children, merges become forks etc.

Get reversed annotations and then plan the merge as usual.

e.g.
C:[B]
B:[A]
A:[NULL_REVISION]
C=['new-C', 'new-B']
B=['new-B', 'new-A']
A=['gone-B', 'new-A]

reverse the graph:
C:[NULL_REVISION]
B:[C]
A:[B]
annotate via the new graph:
C=[(C, 'new-C'), (C, 'new-B')]
B=[(C, 'new-B'), (B, 'new-A')]
A=[(A, 'gone-B', (B, 'new-A')]

-Rob



-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071220/814d8513/attachment-0001.pgp 


More information about the bazaar mailing list