diff options
| author |  Sam Vilain <sam.vilain@catalyst.net.nz> | 2009-10-20 15:42:03 +1300 |
|---|---|---|
| committer |  Eric Wong <normalperson@yhbt.net> | 2009-10-26 23:54:24 -0700 |
| commit | dff589ef949e97cbec5363b105ba27f6e85594fb (patch) | |
| tree | 408550b1792b33e49f76ab276a169fff6c6991ac /git-gui/lib/branch_create.tcl | |
| parent | git-svn: add test data for SVN 1.5+ merge, with script. (diff) | |
| download | tgif-dff589ef949e97cbec5363b105ba27f6e85594fb.tar.xz | |
git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
This feature is long overdue; convert SVN's merge representation to git's
as revisions are imported. This works by converting the list of revisions
in each line of the svn:mergeinfo into git revision ranges, and then
checking the latest of each of these revision ranges for A) being new and
B) now being completely merged.
Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-gui/lib/branch_create.tcl')
0 files changed, 0 insertions, 0 deletions