| commit | 98c4ab32f80d00d0254bfdcab8d934dcda6a7504 | |
| author | Bryan Jacobs <bjacobs@woti.com> | |
| Wed, 31 Aug 2011 16:48:39 +0000 (31 12:48 -0400) | ||
| committer | Eric Wong <normalperson@yhbt.net> | |
| Thu, 1 Sep 2011 19:55:09 +0000 (1 19:55 +0000) | ||
| tree | c129f11b84e4faf77db205fd41181fba67306e1d | treesnapshot (tar.gz zip) |
| parent | 85f022e9c124ffeda31a50cab878e1418d694d87 | commitdiff |
git-svn: Teach dcommit --mergeinfo to handle multiple lines
"svn dcommit --mergeinfo" replaces the svn:mergeinfo property in an
upstream SVN repository with the given text. The svn:mergeinfo
property may contain commits originating on multiple branches,
separated by newlines.
Cause space characters in the mergeinfo to be replaced by newlines,
allowing a user to create history representing multiple branches being
merged into one.
Update the corresponding documentation and add a test for the new
functionality.
Signed-off-by: Bryan Jacobs <bjacobs@woti.com>
Acked-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
"svn dcommit --mergeinfo" replaces the svn:mergeinfo property in an
upstream SVN repository with the given text. The svn:mergeinfo
property may contain commits originating on multiple branches,
separated by newlines.
Cause space characters in the mergeinfo to be replaced by newlines,
allowing a user to create history representing multiple branches being
merged into one.
Update the corresponding documentation and add a test for the new
functionality.
Signed-off-by: Bryan Jacobs <bjacobs@woti.com>
Acked-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
| Documentation/git-svn.txt | diffblobblamehistory | |
| git-svn.perl | diffblobblamehistory | |
| t/t9158-git-svn-mergeinfo.sh | diffblobblamehistory |