diff options
| author | Sam Vilain <sam.vilain@catalyst.net.nz> | 2009-10-20 15:42:01 +1300 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2009-10-26 23:51:31 -0700 |
| commit | f1264bd65451a68e87e0f99c9601cfa1b3244db6 (patch) | |
| tree | 4703c7293c10dacfdf731058f8fd0caebc61484f /t/t9151 | |
| parent | a5e9c7dfe4732b560ab5dfc75e718bfda2027990 (diff) | |
| download | git-f1264bd65451a68e87e0f99c9601cfa1b3244db6.tar.gz git-f1264bd65451a68e87e0f99c9601cfa1b3244db6.tar.xz | |
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')
0 files changed, 0 insertions, 0 deletions