git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] git-svn: fix dcommit clobbering upstream when committing multiple changes

From
EWEric Wong <normalperson@yhbt.net>
Date
Sep 1, 2007, 09:33 UTC
Message-ID
<20070901093303.GA9867@soma>
In-Reply-To
<20070901054321.GA8021@diana.vm.bytemark.co.uk>
Karl Hasselström <kha@treskal.com> wrote:
Show 19 quoted lines
> 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
Previous: Karl HasselströmNext: Karl Hasselström
Message 10 of 11 in “git svn dcommit not checking if up-to-date?”
  1. Johannes SchindelinAug 31, 2007
  2. David WatsonAug 31, 2007
  3. Eric WongAug 31, 2007
  4. Johannes SchindelinAug 31, 2007
  5. David WatsonAug 31, 2007
  6. Test for git-svn dcommit clobbering changesDavid Watson, Sep 1, 2007
  7. git-svn: fix dcommit clobbering upstream when committing multiple changesEric Wong, Sep 1, 2007
  8. Johannes SchindelinSep 1, 2007
  9. Karl HasselströmSep 1, 2007
  10. Eric WongSep 1, 2007
  11. Karl HasselströmSep 1, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.