![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Alex Vandiver <alex@chmrr.net> | |
| Sun, 29 Nov 2009 07:20:21 +0000 (02:20 -0500) | ||
| committer | Eric Wong <normalperson@yhbt.net> | |
| Tue, 8 Dec 2009 04:25:40 +0000 (20:25 -0800) | ||
| commit | e9e4c8b7473f6ee21f452c66430a0763681243d7 | |
| tree | afe4839ee21aaaa7cf91d1446f6908480e93a2b2 | tree | snapshot |
| parent | 9a424b276c409a3510e7735b6ecc012f50dc2a49 | commit | diff |
git-svn: sort svk merge tickets to account for minimal parents
When merging branches based on svk:merge properties, a single merge
can have updated or added multiple svk:merge lines. Attempt to
include the minimal set of parents by sorting the merge properties in
order of revision, highest to lowest.
Signed-off-by: Alex Vandiver <alex@chmrr.net>
Acked-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
When merging branches based on svk:merge properties, a single merge
can have updated or added multiple svk:merge lines. Attempt to
include the minimal set of parents by sorting the merge properties in
order of revision, highest to lowest.
Signed-off-by: Alex Vandiver <alex@chmrr.net>
Acked-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
| git-svn.perl | diff | blob | history |