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

Re: git-svn: commit all changes as one svn revision?

From
Thomas Rast <trast@student.ethz.ch>
Date
May 23, 2008, 16:31 UTC
Message-ID
<200805231831.42984.trast@student.ethz.ch>
In-Reply-To
<9af502e50805230908t76c9b26exd36cfb6d0f1a9bcf@mail.gmail.com>
You wrote:
> I make a bunch of git commits developing something that was checked
> out from a svn repo using git-svn.  I want to commit all the changes
> since my last dcommit as one revision, rather than having each git
> commit checked in separately, as dcommit behaves.
I usually do

$ git checkout -b side master ... edit, commit ... $ git checkout master $ git merge --no-ff side $ git-svn dcommit

The resulting merge commit looks like a normal merge to Git (keeping history intact), but like a squashed commit of all changes on 'side' to SVN.

(If you made all commits on master, you can branch 'side' and hard reset master to origin/master first.)

- Thomas
-- 
Thomas Rast
trast@student.ethz.ch
Previous: Thomas Harning
Message 3 of 3 in “git-svn: commit all changes as one svn revision?”
  1. Robert AndersonMay 23, 2008
  2. Thomas HarningMay 23, 2008
  3. Thomas RastMay 23, 2008

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.