git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Seth Falcon <sethfalcon@gmail.com>
To: git@vger.kernel.org
Subject: Re: git-svn bug?
Date: Wed, 15 Nov 2006 14:33:47 -0800	[thread overview]
Message-ID: <m2psbocpbo.fsf@ziti.local> (raw)
In-Reply-To: <op.ti2svo0ozidtg1@rygel.lnxi.com> (Troy Telford's message of "Wed, 15 Nov 2006 14:05:37 -0700")

"Troy Telford" <ttelford.groups@gmail.com> writes:

> I've got a repository I've converted over to git from svn.  (using
> git-svn.  since there's only been one branch, I figured I could skip
> git-svnimport).
>
> For quite a while, all I did was fetch/rebase from the svn repository
> to  my git repository; all of my own work was committed to the git
> repository;  none of the changes were commited to the svn repository.
>
> Then came the time to commit changes from my git repository to the svn
> repository.
>
> Being somewhat cautious, I created an empty 'dummy' svn repository and
> familiarize myself with using git-svn to commit from git -> svn.
>
> I ran:
> git-svn fetch
> git-svn rebase remotes/git-svn (already updated)
> git-svn dcommit (to push my changes to the svn repository)

I always send commits as:

git-svn dcommit remotes/git-svn..master

Possibly replacing master with whatever git branch I'm working on.
One nice thing about this approach is that you can sort of preview the
commit as:

  git diff remotes/git-svn..master

[but that just shows overall diffs and git-svn dcommit will apply each
commit in master separately to svn]


  parent reply	other threads:[~2006-11-15 22:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-15 21:05 git-svn bug? Troy Telford
2006-11-15 21:43 ` Junio C Hamano
2006-11-15 22:55   ` Troy Telford
2006-11-17  8:55     ` Eric Wong
2006-11-17 21:17       ` Troy Telford
2006-11-19 16:52         ` Eric Wong
2006-11-15 22:33 ` Seth Falcon [this message]
2006-11-15 22:37   ` Shawn Pearce
2006-11-16 15:32     ` Seth Falcon
2006-11-15 23:09   ` Troy Telford

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=m2psbocpbo.fsf@ziti.local \
    --to=sethfalcon@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).