From: Sam Vilain <sam.vilain@catalyst.net.nz>
Date: Tue, 20 Oct 2009 02:42:01 +0000 (+1300)
Subject: git-svn: convert SVK merge tickets to extra parents
X-Git-Tag: v1.6.6-rc0~95^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f1264bd65451a68e87e0f99c9601cfa1b3244db6?hp=f1264bd65451a68e87e0f99c9601cfa1b3244db6

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>
---