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
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

Previous: Eric WongNext: Karl Hasselström
Message 8 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.