[PATCH] Test for git-svn dcommit clobbering changes
- From
- David Watson <dwatson@mimvista.com>
- Date
- Sep 1, 2007, 00:25 UTC
- Message-ID
- <20070901002501.GA11591@mimvista.com>
- In-Reply-To
- <20070831234854.GA6451@mimvista.com>
If you make multiple commits, and a commit other than the first applies to the same file as a new change in the SVN repository, git-svn will blow away the other commit's changes.
---
On Fri, Aug 31, 2007 at 07:48:55PM -0400, David Watson wrote:
Show 14 quoted lines
> I just reproduced this one in a live repository. Here's what you do: > > $ git checkout -b breakme trunk > $ vi file1.txt > $ git-commit -a -m 'first change' > $ vi file2.txt > $ git-commit -a -m 'second change' > ..... Full moon, become a werewolf ...... > C:\svnrepo> edit file2.txt > C:\svnrepo> svn commit -m 'this will be gone' > ..... Become yourself again .... > $ git svn fetch --all # (not sure if this is necessary) > $ git svn dcommit > $ git log -p
t/t9106-git-svn-commit-diff-clobber.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh index 6f132f2..2706153 100755 --- a/t/t9106-git-svn-commit-diff-clobber.sh +++ b/t/t9106-git-svn-commit-diff-clobber.sh @@ -50,6 +50,9 @@ test_expect_failure 'dcommit fails to commit because of conflict' " svn commit -m 'fourth line from svn' && cd .. && rm -rf t.svn && + echo another file from git >> file2 && + git add file2 && + git commit -m 'another file here' && echo 'fourth line from git' >> file && git commit -a -m 'fourth line from git' && git-svn dcommit
-- 1.5.3.rc4 Dave Watson