summaryrefslogtreecommitdiff
path: root/t/t4101/diff.1-0
diff options
context:
space:
mode:
authorLibravatar Eric Wong <normalperson@yhbt.net>2007-08-31 18:16:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-08-31 23:22:51 -0700
commit751eb39590a1325e761a84bedd5ca2660d2d3497 (patch)
tree1c921eda3357d7c368685d491215e90a34085cc9 /t/t4101/diff.1-0
parentgit-svn: Protect against "diff.color = true". (diff)
downloadtgif-751eb39590a1325e761a84bedd5ca2660d2d3497.tar.xz
git-svn: fix dcommit clobbering upstream when committing multiple changes
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>
Diffstat (limited to 't/t4101/diff.1-0')
0 files changed, 0 insertions, 0 deletions