From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Eric Wong <normalperson@yhbt.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] git-svn: fix dcommit clobbering upstream when committing multiple changes
Date: Sat, 1 Sep 2007 02:32:51 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0709010232260.28586@racer.site> (raw)
In-Reply-To: <20070901011612.GA3407@untitled>
Hi,
On Fri, 31 Aug 2007, Eric Wong wrote:
> 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
next prev parent reply other threads:[~2007-09-01 1:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-31 21:04 git svn dcommit not checking if up-to-date? Johannes Schindelin
2007-08-31 21:46 ` David Watson
2007-08-31 22:18 ` Eric Wong
2007-08-31 23:17 ` Johannes Schindelin
2007-08-31 23:48 ` David Watson
2007-09-01 0:25 ` [PATCH] Test for git-svn dcommit clobbering changes David Watson
2007-09-01 1:16 ` [PATCH] git-svn: fix dcommit clobbering upstream when committing multiple changes Eric Wong
2007-09-01 1:32 ` Johannes Schindelin [this message]
2007-09-01 5:43 ` Karl Hasselström
2007-09-01 9:33 ` Eric Wong
2007-09-01 10:24 ` Karl Hasselström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0709010232260.28586@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).