2009-06-23 17:02:08 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2009 Marc Branchaud
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
test_description='git svn multiple branch and tag paths in the svn repo'
|
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup svnrepo' '
|
|
|
|
|
mkdir project \
|
|
|
|
|
project/trunk \
|
|
|
|
|
project/b_one \
|
|
|
|
|
project/b_two \
|
|
|
|
|
project/tags_A \
|
|
|
|
|
project/tags_B &&
|
|
|
|
|
echo 1 > project/trunk/a.file &&
|
2009-06-26 21:08:19 +00:00
|
|
|
svn_cmd import -m "$test_description" project "$svnrepo/project" &&
|
2009-06-23 17:02:08 +00:00
|
|
|
rm -rf project &&
|
2009-06-26 21:08:19 +00:00
|
|
|
svn_cmd cp -m "Branch 1" "$svnrepo/project/trunk" \
|
|
|
|
|
"$svnrepo/project/b_one/first" &&
|
|
|
|
|
svn_cmd cp -m "Tag 1" "$svnrepo/project/trunk" \
|
|
|
|
|
"$svnrepo/project/tags_A/1.0" &&
|
|
|
|
|
svn_cmd co "$svnrepo/project" svn_project &&
|
|
|
|
|
( cd svn_project &&
|
2009-06-23 17:02:08 +00:00
|
|
|
echo 2 > trunk/a.file &&
|
2009-06-26 21:08:19 +00:00
|
|
|
svn_cmd ci -m "Change 1" trunk/a.file &&
|
|
|
|
|
svn_cmd cp -m "Branch 2" "$svnrepo/project/trunk" \
|
|
|
|
|
"$svnrepo/project/b_one/second" &&
|
|
|
|
|
svn_cmd cp -m "Tag 2" "$svnrepo/project/trunk" \
|
|
|
|
|
"$svnrepo/project/tags_A/2.0" &&
|
2009-06-23 17:02:08 +00:00
|
|
|
echo 3 > trunk/a.file &&
|
2009-06-26 21:08:19 +00:00
|
|
|
svn_cmd ci -m "Change 2" trunk/a.file &&
|
|
|
|
|
svn_cmd cp -m "Branch 3" "$svnrepo/project/trunk" \
|
|
|
|
|
"$svnrepo/project/b_two/1" &&
|
|
|
|
|
svn_cmd cp -m "Tag 3" "$svnrepo/project/trunk" \
|
|
|
|
|
"$svnrepo/project/tags_A/3.0" &&
|
2009-06-23 17:02:08 +00:00
|
|
|
echo 4 > trunk/a.file &&
|
2009-06-26 21:08:19 +00:00
|
|
|
svn_cmd ci -m "Change 3" trunk/a.file &&
|
|
|
|
|
svn_cmd cp -m "Branch 4" "$svnrepo/project/trunk" \
|
|
|
|
|
"$svnrepo/project/b_two/2" &&
|
|
|
|
|
svn_cmd cp -m "Tag 4" "$svnrepo/project/trunk" \
|
|
|
|
|
"$svnrepo/project/tags_A/4.0" &&
|
|
|
|
|
svn_cmd up &&
|
2009-06-23 17:02:08 +00:00
|
|
|
echo 5 > b_one/first/a.file &&
|
2009-06-26 21:08:19 +00:00
|
|
|
svn_cmd ci -m "Change 4" b_one/first/a.file &&
|
|
|
|
|
svn_cmd cp -m "Tag 5" "$svnrepo/project/b_one/first" \
|
|
|
|
|
"$svnrepo/project/tags_B/v5" &&
|
2009-06-23 17:02:08 +00:00
|
|
|
echo 6 > b_one/second/a.file &&
|
2009-06-26 21:08:19 +00:00
|
|
|
svn_cmd ci -m "Change 5" b_one/second/a.file &&
|
|
|
|
|
svn_cmd cp -m "Tag 6" "$svnrepo/project/b_one/second" \
|
|
|
|
|
"$svnrepo/project/tags_B/v6" &&
|
2009-06-23 17:02:08 +00:00
|
|
|
echo 7 > b_two/1/a.file &&
|
2009-06-26 21:08:19 +00:00
|
|
|
svn_cmd ci -m "Change 6" b_two/1/a.file &&
|
|
|
|
|
svn_cmd cp -m "Tag 7" "$svnrepo/project/b_two/1" \
|
|
|
|
|
"$svnrepo/project/tags_B/v7" &&
|
2009-06-23 17:02:08 +00:00
|
|
|
echo 8 > b_two/2/a.file &&
|
2009-06-26 21:08:19 +00:00
|
|
|
svn_cmd ci -m "Change 7" b_two/2/a.file &&
|
|
|
|
|
svn_cmd cp -m "Tag 8" "$svnrepo/project/b_two/2" \
|
|
|
|
|
"$svnrepo/project/tags_B/v8"
|
|
|
|
|
)
|
|
|
|
|
'
|
2009-06-23 17:02:08 +00:00
|
|
|
|
|
|
|
|
test_expect_success 'clone multiple branch and tag paths' '
|
|
|
|
|
git svn clone -T trunk \
|
|
|
|
|
-b b_one/* --branches b_two/* \
|
|
|
|
|
-t tags_A/* --tags tags_B \
|
|
|
|
|
"$svnrepo/project" git_project &&
|
2009-06-26 21:08:19 +00:00
|
|
|
( cd git_project &&
|
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
|
|
|
git rev-parse refs/remotes/origin/first &&
|
|
|
|
|
git rev-parse refs/remotes/origin/second &&
|
|
|
|
|
git rev-parse refs/remotes/origin/1 &&
|
|
|
|
|
git rev-parse refs/remotes/origin/2 &&
|
|
|
|
|
git rev-parse refs/remotes/origin/tags/1.0 &&
|
|
|
|
|
git rev-parse refs/remotes/origin/tags/2.0 &&
|
|
|
|
|
git rev-parse refs/remotes/origin/tags/3.0 &&
|
|
|
|
|
git rev-parse refs/remotes/origin/tags/4.0 &&
|
|
|
|
|
git rev-parse refs/remotes/origin/tags/v5 &&
|
|
|
|
|
git rev-parse refs/remotes/origin/tags/v6 &&
|
|
|
|
|
git rev-parse refs/remotes/origin/tags/v7 &&
|
|
|
|
|
git rev-parse refs/remotes/origin/tags/v8
|
2009-06-26 21:08:19 +00:00
|
|
|
)
|
|
|
|
|
'
|
2009-06-23 17:02:08 +00:00
|
|
|
|
|
|
|
|
test_expect_success 'Multiple branch or tag paths require -d' '
|
2009-06-26 21:08:19 +00:00
|
|
|
( cd git_project &&
|
2009-06-23 17:02:08 +00:00
|
|
|
test_must_fail git svn branch -m "No new branch" Nope &&
|
|
|
|
|
test_must_fail git svn tag -m "No new tag" Tagless &&
|
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
|
|
|
test_must_fail git rev-parse refs/remotes/origin/Nope &&
|
|
|
|
|
test_must_fail git rev-parse refs/remotes/origin/tags/Tagless
|
2009-06-26 21:08:19 +00:00
|
|
|
) &&
|
|
|
|
|
( cd svn_project &&
|
|
|
|
|
svn_cmd up &&
|
2009-06-23 17:02:08 +00:00
|
|
|
test_must_fail test -d b_one/Nope &&
|
|
|
|
|
test_must_fail test -d b_two/Nope &&
|
|
|
|
|
test_must_fail test -d tags_A/Tagless &&
|
2009-06-26 21:08:19 +00:00
|
|
|
test_must_fail test -d tags_B/Tagless
|
|
|
|
|
)
|
|
|
|
|
'
|
2009-06-23 17:02:08 +00:00
|
|
|
|
|
|
|
|
test_expect_success 'create new branches and tags' '
|
2009-06-26 21:08:19 +00:00
|
|
|
( cd git_project &&
|
2009-07-06 23:40:02 +00:00
|
|
|
git svn branch -m "New branch 1" -d b_one New1 ) &&
|
2009-06-26 21:08:19 +00:00
|
|
|
( cd svn_project &&
|
|
|
|
|
svn_cmd up && test -e b_one/New1/a.file ) &&
|
2009-06-23 17:02:08 +00:00
|
|
|
|
2009-06-26 21:08:19 +00:00
|
|
|
( cd git_project &&
|
2009-07-06 23:40:02 +00:00
|
|
|
git svn branch -m "New branch 2" -d b_two New2 ) &&
|
2009-06-26 21:08:19 +00:00
|
|
|
( cd svn_project &&
|
|
|
|
|
svn_cmd up && test -e b_two/New2/a.file ) &&
|
2009-06-23 17:02:08 +00:00
|
|
|
|
2009-06-26 21:08:19 +00:00
|
|
|
( cd git_project &&
|
2009-07-06 23:40:02 +00:00
|
|
|
git svn branch -t -m "New tag 1" -d tags_A Tag1 ) &&
|
2009-06-26 21:08:19 +00:00
|
|
|
( cd svn_project &&
|
|
|
|
|
svn_cmd up && test -e tags_A/Tag1/a.file ) &&
|
2009-06-23 17:02:08 +00:00
|
|
|
|
2009-06-26 21:08:19 +00:00
|
|
|
( cd git_project &&
|
2009-07-06 23:40:02 +00:00
|
|
|
git svn tag -m "New tag 2" -d tags_B Tag2 ) &&
|
2009-06-26 21:08:19 +00:00
|
|
|
( cd svn_project &&
|
|
|
|
|
svn_cmd up && test -e tags_B/Tag2/a.file )
|
|
|
|
|
'
|
2009-06-23 17:02:08 +00:00
|
|
|
|
|
|
|
|
test_done
|