Re: [PATCH] git-svn: fix dcommit clobbering upstream when committing multiple changes
- From
Karl Hasselström <kha@treskal.com>
- Date
- Sep 1, 2007, 05:43 UTC
- Message-ID
- <20070901054321.GA8021@diana.vm.bytemark.co.uk>
- In-Reply-To
- <20070901011612.GA3407@untitled>
On 2007-08-31 18:16:12 -0700, Eric Wong wrote:
Show 14 quoted lines
> 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.
Shouldn't it be a simple matter of checking if the total diff over the whole series would conflict with the SVN HEAD?
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle