2007-06-13 09:23:28 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Eric Wong
|
|
|
|
# Based on a script by Joakim Tjernlund <joakim.tjernlund@transmode.se>
|
|
|
|
|
2008-09-08 10:02:08 +00:00
|
|
|
test_description='git svn dcommit handles merges'
|
2007-06-13 09:23:28 +00:00
|
|
|
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
|
|
|
|
big_text_block () {
|
|
|
|
cat << EOF
|
|
|
|
#
|
|
|
|
# (C) Copyright 2000 - 2005
|
|
|
|
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
|
|
#
|
|
|
|
# See file CREDITS for list of people who contributed to this
|
|
|
|
# project.
|
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or
|
|
|
|
# modify it under the terms of the GNU General Public License as
|
|
|
|
# published by the Free Software Foundation; either version 2 of
|
|
|
|
# the License, or (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
2023-11-24 03:35:13 +00:00
|
|
|
# along with this program; if not, see <https://www.gnu.org/licenses/>.
|
2007-06-13 09:23:28 +00:00
|
|
|
#
|
|
|
|
EOF
|
|
|
|
}
|
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'setup svn repository' '
|
2009-05-08 08:06:16 +00:00
|
|
|
svn_cmd co "$svnrepo" mysvnwork &&
|
2007-06-13 09:23:28 +00:00
|
|
|
mkdir -p mysvnwork/trunk &&
|
2010-09-07 01:42:54 +00:00
|
|
|
(
|
|
|
|
cd mysvnwork &&
|
|
|
|
big_text_block >>trunk/README &&
|
2009-05-08 08:06:16 +00:00
|
|
|
svn_cmd add trunk &&
|
2010-09-06 18:39:54 +00:00
|
|
|
svn_cmd ci -m "first commit" trunk
|
2010-09-07 01:42:54 +00:00
|
|
|
)
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2007-06-13 09:23:28 +00:00
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'setup git mirror and merge' '
|
|
|
|
git svn init "$svnrepo" -t tags -T trunk -b branches &&
|
2007-06-13 09:23:28 +00:00
|
|
|
git svn fetch &&
|
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 checkout -b svn remotes/origin/trunk &&
|
2007-06-13 09:23:28 +00:00
|
|
|
git checkout -b merge &&
|
|
|
|
echo new file > new_file &&
|
|
|
|
git add new_file &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git commit -a -m "New file" &&
|
2007-06-13 09:23:28 +00:00
|
|
|
echo hello >> README &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git commit -a -m "hello" &&
|
2007-06-13 09:23:28 +00:00
|
|
|
echo add some stuff >> new_file &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git commit -a -m "add some stuff" &&
|
2007-06-13 09:23:28 +00:00
|
|
|
git checkout svn &&
|
|
|
|
mv -f README tmp &&
|
|
|
|
echo friend > README &&
|
|
|
|
cat tmp >> README &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git commit -a -m "friend" &&
|
2013-10-31 09:25:33 +00:00
|
|
|
git merge merge
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2007-06-13 09:23:28 +00:00
|
|
|
|
|
|
|
test_debug 'gitk --all & sleep 1'
|
|
|
|
|
|
|
|
test_expect_success 'verify pre-merge ancestry' "
|
2016-01-12 10:45:17 +00:00
|
|
|
test x\$(git rev-parse --verify refs/heads/svn^2) = \
|
|
|
|
x\$(git rev-parse --verify refs/heads/merge) &&
|
2018-03-27 17:31:37 +00:00
|
|
|
git cat-file commit refs/heads/svn^ >actual &&
|
|
|
|
grep '^friend$' actual
|
2007-06-13 09:23:28 +00:00
|
|
|
"
|
|
|
|
|
|
|
|
test_expect_success 'git svn dcommit merges' "
|
|
|
|
git svn dcommit
|
|
|
|
"
|
|
|
|
|
|
|
|
test_debug 'gitk --all & sleep 1'
|
|
|
|
|
|
|
|
test_expect_success 'verify post-merge ancestry' "
|
2016-01-12 10:45:17 +00:00
|
|
|
test x\$(git rev-parse --verify refs/heads/svn) = \
|
|
|
|
x\$(git rev-parse --verify refs/remotes/origin/trunk) &&
|
|
|
|
test x\$(git rev-parse --verify refs/heads/svn^2) = \
|
|
|
|
x\$(git rev-parse --verify refs/heads/merge) &&
|
2018-03-27 17:31:37 +00:00
|
|
|
git cat-file commit refs/heads/svn^ >actual &&
|
|
|
|
grep '^friend$' actual
|
2007-06-13 09:23:28 +00:00
|
|
|
"
|
|
|
|
|
2007-11-05 11:21:48 +00:00
|
|
|
test_expect_success 'verify merge commit message' "
|
2018-03-27 17:31:37 +00:00
|
|
|
git rev-list --pretty=raw -1 refs/heads/svn >actual &&
|
|
|
|
grep \" Merge branch 'merge' into svn\" actual
|
2007-11-05 11:21:48 +00:00
|
|
|
"
|
|
|
|
|
2007-06-13 09:23:28 +00:00
|
|
|
test_done
|