Re: [PATCH] git-svn: fix dcommit clobbering upstream when committing multiple changes
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Sep 1, 2007, 01:32 UTC
- Message-ID
- <Pine.LNX.4.64.0709010232260.28586@racer.site>
- In-Reply-To
- <20070901011612.GA3407@untitled>
Hi,
On Fri, 31 Aug 2007, Eric Wong wrote:
Show 9 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.
Thanks for the quick fix; will play with it on Sunday...
Ciao, Dscho