summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authormartin@catalyst.net.nz <martin@catalyst.net.nz>2005-09-10 11:42:24 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-10 17:44:21 (GMT)
commitb779d5f009f8e12df13d650ad8a57e63068a9c82 (patch)
tree25b8e86f087aacc3dd1e9cd52debff3a2930d40a /diff.c
parent866ff2f7ce60519e562a6ae37886609c69d5eb70 (diff)
downloadgit-b779d5f009f8e12df13d650ad8a57e63068a9c82.zip
git-b779d5f009f8e12df13d650ad8a57e63068a9c82.tar.gz
git-b779d5f009f8e12df13d650ad8a57e63068a9c82.tar.bz2
[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>
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions