From: Eric Wong <normalperson@yhbt•net>
To: "Karl Hasselström" <kha@treskal•com>
Cc: Junio C Hamano <gitster@pobox•com>,
Johannes Schindelin <Johannes.Schindelin@gmx•de>,
git@vger•kernel.org
Subject: Re: [PATCH] git-svn: fix dcommit clobbering upstream when committing multiple changes
Date: Sat, 1 Sep 2007 02:33:03 -0700 [thread overview]
Message-ID: <20070901093303.GA9867@soma> (raw)
In-Reply-To: <20070901054321.GA8021@diana.vm.bytemark.co.uk>
Karl Hasselström <kha@treskal•com> wrote:
> On 2007-08-31 18:16:12 -0700, 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.
> >
> > --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?
I don't think you can actually check for SVN conflicts until attempting
to do commit.
--
Eric Wong
next prev parent reply other threads:[~2007-09-01 9: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
2007-09-01 5:43 ` Karl Hasselström
2007-09-01 9:33 ` Eric Wong [this message]
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=20070901093303.GA9867@soma \
--to=normalperson@yhbt$(echo .)net \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=kha@treskal$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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