Code

git-svn: fix dcommit losing changes when out-of-date from svn
authorEric Wong <normalperson@yhbt.net>
Thu, 9 Nov 2006 09:19:37 +0000 (01:19 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 9 Nov 2006 17:34:46 +0000 (09:34 -0800)
commit45bf473a7bc2c40c8aea3d34a0eab7a41e77a8ff
tree6095f8390834dc1244f86bbdf1313d3a3abc2203
parenta35a045874379467395e0909958827ad89afc03d
git-svn: fix dcommit losing changes when out-of-date from svn

There was a bug in dcommit (and commit-diff) which caused deltas
to be generated against the latest version of the changed file
in a repository, and not the revision we are diffing (the tree)
against locally.

This bug can cause recent changes to the svn repository to be
silently clobbered by git-svn if our repository is out-of-date.

Thanks to Steven Grimm for noticing the bug.

The (few) people using the commit-diff command are now required
to use the -r/--revision argument.  dcommit usage is unchanged.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-svn.txt
git-svn.perl
t/t9105-git-svn-commit-diff.sh
t/t9106-git-svn-commit-diff-clobber.sh [new file with mode: 0755]