summaryrefslogtreecommitdiff
path: root/branch.h
diff options
context:
space:
mode:
authorLibravatar Sam Vilain <sam.vilain@catalyst.net.nz>2009-10-20 15:42:03 +1300
committerLibravatar Eric Wong <normalperson@yhbt.net>2009-10-26 23:54:24 -0700
commitdff589ef949e97cbec5363b105ba27f6e85594fb (patch)
tree408550b1792b33e49f76ab276a169fff6c6991ac /branch.h
parentgit-svn: add test data for SVN 1.5+ merge, with script. (diff)
downloadtgif-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 'branch.h')
0 files changed, 0 insertions, 0 deletions