-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
Steven Walter
authored and
Eric Wong
committed
Dec 9, 2010
1 parent
f80b6de
commit 6abd933
Showing
2 changed files
with
55 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
#!/bin/sh | ||
# | ||
# Copyright (c) 2010 Steven Walter | ||
# | ||
|
||
test_description='git svn mergeinfo propagation' | ||
|
||
. ./lib-git-svn.sh | ||
|
||
say 'define NO_SVN_TESTS to skip git svn tests' | ||
|
||
test_expect_success 'initialize source svn repo' ' | ||
svn_cmd mkdir -m x "$svnrepo"/trunk && | ||
svn_cmd co "$svnrepo"/trunk "$SVN_TREE" && | ||
( | ||
cd "$SVN_TREE" && | ||
touch foo && | ||
svn_cmd add foo && | ||
svn_cmd commit -m "initial commit" | ||
) && | ||
rm -rf "$SVN_TREE" | ||
' | ||
|
||
test_expect_success 'clone svn repo' ' | ||
git svn init "$svnrepo"/trunk && | ||
git svn fetch | ||
' | ||
|
||
test_expect_success 'change svn:mergeinfo' ' | ||
touch bar && | ||
git add bar && | ||
git commit -m "bar" && | ||
git svn dcommit --mergeinfo="/branches/foo:1-10" | ||
' | ||
|
||
test_expect_success 'verify svn:mergeinfo' ' | ||
mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) | ||
test "$mergeinfo" = "/branches/foo:1-10" | ||
' | ||
|
||
test_done |