mirror of
https://github.com/git/git.git
synced 2024-11-14 21:23:03 +01:00
751eb39590
Although dcommit could detect if the first commit in the series would conflict with the HEAD revision in SVN, it could not detect conflicts in further commits it made. Now we rebase each uncommitted change after each revision is committed to SVN to ensure that we are up-to-date. git-rebase will bail out on conflict errors if our next change cannot be applied and committed to SVN cleanly, preventing accidental clobbering of changes on the SVN-side. --no-rebase users will have trouble with this, and are thus warned if they are committing more than one commit. Fixing this for (hopefully uncommon) --no-rebase users would be more complex and will probably happen at a later date. Thanks to David Watson for finding this and the original test. Signed-off-by: Junio C Hamano <gitster@pobox.com>
99 lines
2.5 KiB
Bash
Executable file
99 lines
2.5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Eric Wong
|
|
test_description='git-svn commit-diff clobber'
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'initialize repo' "
|
|
mkdir import &&
|
|
cd import &&
|
|
echo initial > file &&
|
|
svn import -m 'initial' . $svnrepo &&
|
|
cd .. &&
|
|
echo initial > file &&
|
|
git update-index --add file &&
|
|
git commit -a -m 'initial'
|
|
"
|
|
test_expect_success 'commit change from svn side' "
|
|
svn co $svnrepo t.svn &&
|
|
cd t.svn &&
|
|
echo second line from svn >> file &&
|
|
poke file &&
|
|
svn commit -m 'second line from svn' &&
|
|
cd .. &&
|
|
rm -rf t.svn
|
|
"
|
|
|
|
test_expect_failure 'commit conflicting change from git' "
|
|
echo second line from git >> file &&
|
|
git commit -a -m 'second line from git' &&
|
|
git-svn commit-diff -r1 HEAD~1 HEAD $svnrepo
|
|
" || true
|
|
|
|
test_expect_success 'commit complementing change from git' "
|
|
git reset --hard HEAD~1 &&
|
|
echo second line from svn >> file &&
|
|
git commit -a -m 'second line from svn' &&
|
|
echo third line from git >> file &&
|
|
git commit -a -m 'third line from git' &&
|
|
git-svn commit-diff -r2 HEAD~1 HEAD $svnrepo
|
|
"
|
|
|
|
test_expect_failure 'dcommit fails to commit because of conflict' "
|
|
git-svn init $svnrepo &&
|
|
git-svn fetch &&
|
|
git reset --hard refs/remotes/git-svn &&
|
|
svn co $svnrepo t.svn &&
|
|
cd t.svn &&
|
|
echo fourth line from svn >> file &&
|
|
poke file &&
|
|
svn commit -m 'fourth line from svn' &&
|
|
cd .. &&
|
|
rm -rf t.svn &&
|
|
echo 'fourth line from git' >> file &&
|
|
git commit -a -m 'fourth line from git' &&
|
|
git-svn dcommit
|
|
" || true
|
|
|
|
test_expect_success 'dcommit does the svn equivalent of an index merge' "
|
|
git reset --hard refs/remotes/git-svn &&
|
|
echo 'index merge' > file2 &&
|
|
git update-index --add file2 &&
|
|
git commit -a -m 'index merge' &&
|
|
echo 'more changes' >> file2 &&
|
|
git update-index file2 &&
|
|
git commit -a -m 'more changes' &&
|
|
git-svn dcommit
|
|
"
|
|
|
|
test_expect_success 'commit another change from svn side' "
|
|
svn co $svnrepo t.svn &&
|
|
cd t.svn &&
|
|
echo third line from svn >> file &&
|
|
poke file &&
|
|
svn commit -m 'third line from svn' &&
|
|
cd .. &&
|
|
rm -rf t.svn
|
|
"
|
|
|
|
test_expect_failure 'multiple dcommit from git-svn will not clobber svn' "
|
|
git reset --hard refs/remotes/git-svn &&
|
|
echo new file >> new-file &&
|
|
git update-index --add new-file &&
|
|
git commit -a -m 'new file' &&
|
|
echo clobber > file &&
|
|
git commit -a -m 'clobber' &&
|
|
git svn dcommit
|
|
" || true
|
|
|
|
|
|
test_expect_success 'check that rebase really failed' 'test -d .dotest'
|
|
|
|
test_expect_success 'resolve, continue the rebase and dcommit' "
|
|
echo clobber and I really mean it > file &&
|
|
git update-index file &&
|
|
git rebase --continue &&
|
|
git svn dcommit
|
|
"
|
|
|
|
test_done
|