summaryrefslogtreecommitdiff
path: root/t/t9158-git-svn-mergeinfo.sh
Commit message (Collapse)AuthorAgeFilesLines
* t/t91*: do not say how to avoid the testsMichael J Gruber2016-07-251-2/+0
| | | | | | | | | | | | | | Some of the tests "say" how to stop the svn tests from running, some do not. The test suite is directed at people reading t/README where we keep all information about running the test suite (partly, with options etc.). Remove said "say" occurences. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* t9158, t9161: fix broken &&-chain in git-svn testsMichael J Gruber2015-03-201-2/+2
| | | | | | | | | All of these cases are moderate since they would most probably not lead to missed failing tests; either they would fail otherwise, or fail a rm in test_when_finished only. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-svn: Teach dcommit --mergeinfo to handle multiple linesBryan Jacobs2011-09-011-0/+13
| | | | | | | | | | | | | | | | | | "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>
* tests: flip executable bit on t9158Jeff King2010-12-131-0/+0
| | | | | | | All tests are supposed to be executable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-svn: allow the mergeinfo property to be setSteven Walter2010-12-101-0/+41
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>