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

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

[Robert Anderson]

Use case:

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.

Is there a way to do this?

Thanks,
Bob Anderson

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

[Thomas Harning]

On May 23, 2008, at 12:08 PM, Robert Anderson 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.
>
> Is there a way to do this?
git-svn dcommit -m
  (IIRR)

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

[Thomas Rast]

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