![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sam Vilain <sam.vilain@catalyst.net.nz> | |
| Tue, 20 Oct 2009 02:42:01 +0000 (15:42 +1300) | ||
| committer | Eric Wong <normalperson@yhbt.net> | |
| Tue, 27 Oct 2009 06:51:31 +0000 (23:51 -0700) | ||
| commit | f1264bd65451a68e87e0f99c9601cfa1b3244db6 | |
| tree | 4703c7293c10dacfdf731058f8fd0caebc61484f | tree | snapshot |
| parent | a5e9c7dfe4732b560ab5dfc75e718bfda2027990 | commit | diff |
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>
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>
| git-svn.perl | diff | blob | history | |
| t/t9150-svk-mergetickets.sh | [new file with mode: 0644] | blob |