Code

[PATCH] archimport - add merge detection
authormartin@catalyst.net.nz <martin@catalyst.net.nz>
Sat, 10 Sep 2005 11:42:24 +0000 (23:42 +1200)
committerJunio C Hamano <junkio@cox.net>
Sat, 10 Sep 2005 17:44:21 +0000 (10:44 -0700)
commitb779d5f009f8e12df13d650ad8a57e63068a9c82
tree25b8e86f087aacc3dd1e9cd52debff3a2930d40a
parent866ff2f7ce60519e562a6ae37886609c69d5eb70
[PATCH] archimport - add merge detection

We now keep track of the patches merged in each branch since they have
diverged, using the records that the Arch "logs" provide. Merge parents
for a commit are defined if we are merging a series of patches that starts
from the mergebase.

If patches from a related branch are merged out-of-order, we keep track of
how much has been merged sequentially -- the tip of that sequential merge
is our new parent from that branch.

This mechanism works very well for branches that merge in dovetail and/or
flying fish patterns, probably less well for others.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-archimport.perl