3 commits

Author	SHA1	Message	Date
Bryan Jacobs	98c4ab32f8	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>	2011-09-01 19:55:09 +00:00
Jeff King	28368e9f0b	tests: flip executable bit on t9158 ... All tests are supposed to be executable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-12-13 11:38:11 -08:00
Steven Walter	6abd9332f9	git-svn: allow the mergeinfo property to be set ... As a first step towards preserving merges across dcommit, we need a mechanism to update the svn:mergeinfo property. [ew: fixed bashism and style issues in test case] Signed-off-by: Steven Walter <stevenrwalter@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>	2010-12-10 04:09:48 +08:00