diff options
| author | Eric Wong <normalperson@yhbt.net> | 2007-11-05 03:21:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-05 12:57:34 -0800 |
| commit | c74d9acf20ba0c69bbd67c5b0bb3bd3c2349cebe (patch) | |
| tree | bdb5d97574d07e2b09db5cbe13d71afa3c83ab40 /lockfile.c | |
| parent | ee787400de25ed419f40e70698ba35db475b2d61 (diff) | |
| download | git-c74d9acf20ba0c69bbd67c5b0bb3bd3c2349cebe.tar.gz git-c74d9acf20ba0c69bbd67c5b0bb3bd3c2349cebe.tar.xz | |
git-svn: fix dcommit clobbering when committing a series of diffs
Our revision number sent to SVN is set to the last revision we
committed if we've made any previous commits in a dcommit
invocation.
Although our SVN Editor code uses the delta of two (old) trees
to generate information to send upstream, it'll still send
complete resultant files upstream; even if the tree they're
based against is out-of-date.
The combination of sending a file that does not include the
latest changes, but set with a revision number of a commit we
just made will cause SVN to accept the resultant file even if it
was generated against an old tree.
More trouble was caused when fixing this because we were
rebasing uncessarily at times. We used git-diff-tree to check
the imported SVN revision against our HEAD, not the last tree we
committed to SVN. The unnecessary rebasing caused merge commits
upstream to SVN to fail.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions