]> git.ipfire.org Git - thirdparty/git.git/commit - git-svn.perl
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ce62683) | patch
git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
authorSam Vilain <sam.vilain@catalyst.net.nz>
Tue, 20 Oct 2009 02:42:03 +0000 (15:42 +1300)
committerEric Wong <normalperson@yhbt.net>
Tue, 27 Oct 2009 06:54:24 +0000 (23:54 -0700)
commitdff589ef949e97cbec5363b105ba27f6e85594fb
tree408550b1792b33e49f76ab276a169fff6c6991actree | snapshot
parentce62683096d144749c77e557ecd21c91b840b0f1commit | diff
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>
git-svn.perl diff | blob | blame | history
t/t9151-svn-mergeinfo.sh [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.