2012-08-20 01:39:40 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2012 Steven Walter
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
test_description='git svn merge detection'
|
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
|
|
|
|
|
|
svn_ver="$(svn --version --quiet)"
|
|
|
|
|
case $svn_ver in
|
|
|
|
|
0.* | 1.[0-4].*)
|
|
|
|
|
skip_all="skipping git-svn test - SVN too old ($svn_ver)"
|
|
|
|
|
test_done
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
test_expect_success 'initialize source svn repo' '
|
|
|
|
|
svn_cmd mkdir -m x "$svnrepo"/trunk &&
|
|
|
|
|
svn_cmd mkdir -m x "$svnrepo"/branches &&
|
|
|
|
|
svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
|
|
|
|
|
(
|
|
|
|
|
cd "$SVN_TREE" &&
|
|
|
|
|
touch foo &&
|
|
|
|
|
svn_cmd add foo &&
|
|
|
|
|
svn_cmd commit -m "initial commit" &&
|
|
|
|
|
svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
|
|
|
|
|
svn_cmd switch "$svnrepo"/branches/branch1 &&
|
|
|
|
|
touch bar &&
|
|
|
|
|
svn_cmd add bar &&
|
|
|
|
|
svn_cmd commit -m branch1 &&
|
|
|
|
|
svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 &&
|
|
|
|
|
svn_cmd switch "$svnrepo"/branches/branch2 &&
|
|
|
|
|
touch baz &&
|
|
|
|
|
svn_cmd add baz &&
|
|
|
|
|
svn_cmd commit -m branch2 &&
|
|
|
|
|
svn_cmd switch "$svnrepo"/trunk &&
|
|
|
|
|
touch bar2 &&
|
|
|
|
|
svn_cmd add bar2 &&
|
|
|
|
|
svn_cmd commit -m trunk &&
|
|
|
|
|
svn_cmd switch "$svnrepo"/branches/branch2 &&
|
|
|
|
|
svn_cmd merge "$svnrepo"/trunk &&
|
2018-07-02 00:24:04 +00:00
|
|
|
svn_cmd commit -m "merge trunk" &&
|
2012-08-20 01:39:40 +00:00
|
|
|
svn_cmd switch "$svnrepo"/trunk &&
|
|
|
|
|
svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 &&
|
|
|
|
|
svn_cmd commit -m "merge branch2"
|
|
|
|
|
) &&
|
|
|
|
|
rm -rf "$SVN_TREE"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'clone svn repo' '
|
|
|
|
|
git svn init -s "$svnrepo" &&
|
|
|
|
|
git svn fetch
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2) &&
|
Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
git-svn by default puts its Subversion-tracking refs directly in
refs/remotes/*. This runs counter to Git's convention of using
refs/remotes/$remote/* for storing remote-tracking branches.
Furthermore, combining git-svn with regular git remotes run the risk of
clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
The existing workaround for this is to supply the --prefix=quux/ to
git svn init/clone, so that git-svn's tracking branches end up in
refs/remotes/quux/* instead of refs/remotes/*. However, encouraging
users to specify --prefix to work around a design flaw in git-svn is
suboptimal, and not a long term solution to the problem. Instead,
git-svn should default to use a non-empty prefix that saves
unsuspecting users from the inconveniences described above.
This patch will only affect newly created git-svn setups, as the
--prefix option only applies to git svn init (and git svn clone).
Existing git-svn setups will continue with their existing (lack of)
prefix. Also, if anyone somehow prefers git-svn's old layout, they
can recreate that by explicitly passing an empty prefix (--prefix "")
on the git svn init/clone command line.
The patch changes the default value for --prefix from "" to "origin/",
updates the git-svn manual page, and fixes the fallout in the git-svn
testcases.
(Note that this patch might be easier to review using the --word-diff
and --word-diff-regex=. diff options.)
[ew: squashed description of <= 1.9 behavior into manpage]
Suggested-by: Thomas Ferris Nicolaisen <tfnico@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:07 +00:00
|
|
|
y=$(git rev-parse origin/branch2) &&
|
2012-08-20 01:39:40 +00:00
|
|
|
test "x$x" = "x$y"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_done
|