6abd9332f9
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>
42 lines
833 B
Bash
42 lines
833 B
Bash
#!/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
|