summaryrefslogtreecommitdiff
path: root/t/t9151/make-svnmerge-dump
diff options
context:
space:
mode:
authorSam Vilain <sam.vilain@catalyst.net.nz>2009-10-20 02:42:01 (GMT)
committerEric Wong <normalperson@yhbt.net>2009-10-27 06:51:31 (GMT)
commitf1264bd65451a68e87e0f99c9601cfa1b3244db6 (patch)
tree4703c7293c10dacfdf731058f8fd0caebc61484f /t/t9151/make-svnmerge-dump
parenta5e9c7dfe4732b560ab5dfc75e718bfda2027990 (diff)
downloadgit-f1264bd65451a68e87e0f99c9601cfa1b3244db6.zip
git-f1264bd65451a68e87e0f99c9601cfa1b3244db6.tar.gz
git-f1264bd65451a68e87e0f99c9601cfa1b3244db6.tar.bz2
git-svn: convert SVK merge tickets to extra parents
SVK is a simple case to start with, as its idea of merge parents matches git's one. When a svk:merge ticket is encountered, check each of the listed merged revisions to see if they are in the history of this commit; if not, then we have encountered a merge - record it. [ew: minor formatting cleanups] Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9151/make-svnmerge-dump')
0 files changed, 0 insertions, 0 deletions