All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Joakim Tjernlund" <joakim.tjernlund@transmode.se>
To: <git@vger.kernel.org>
Subject: git-svn and rebase causes duplicate  log entries in svn
Date: Tue, 14 Nov 2006 22:49:14 +0100	[thread overview]
Message-ID: <00ff01c70836$ba7e3d00$1e67a8c0@Jocke> (raw)

I have my own u-boot tree with a local branch where I do my own development.
This this branch(called svn) is connected to a svn repo using git-svn.

Now I want to rebase my svn branch against latest u-boot and commit
my rebased svn branch to svn.

I use git-svn commit -b svn -q remotes/git-svn..svn to commit my latest
changes and when I do so I see my local changes once more in the svn log:
------------------------------------------------------------------------
r321 | jocke | 2006-11-14 09:45:14 +0100 (Tue, 14 Nov 2006) | 2 lines

Add install of HRCW into I2C EEPROM.

and here:
------------------------------------------------------------------------
r46 | jocke | 2006-11-13 19:09:19 +0100 (Mon, 13 Nov 2006) | 2 lines

Add install of HRCW into I2C EEPROM.

Any way to avoid that?

Question, I found that 
  git-svn fetch && git-rebase remotes/git-svn^2 svn
leaves the svn branch at the tip of my latest commit in the
svn branch which makes better sense to me then
  git-svn fetch && git-rebase remotes/git-svn svn
which puts svn at HEAD of remotes/git-svn.

Any reason I should not do the ...-svn^2 variant?

I am using git 1.4.3.5 and subversion 1.4.0

             reply	other threads:[~2006-11-14 21:49 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-14 21:49 Joakim Tjernlund [this message]
2006-11-14 22:55 ` git-svn and rebase causes duplicate log entries in svn Seth Falcon
2006-11-15 10:14   ` Joakim Tjernlund

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='00ff01c70836$ba7e3d00$1e67a8c0@Jocke' \
    --to=joakim.tjernlund@transmode.se \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.