From: Steven Grimm <koreth@midwinter.com>
To: Benoit SIGOURE <tsuna@lrde.epita.fr>
Cc: git@vger.kernel.org, Eric Wong <normalperson@yhbt.net>
Subject: Re: Bug in git-svn: dcommit commits in the wrong branch after a rebase
Date: Thu, 09 Aug 2007 23:46:03 +0800 [thread overview]
Message-ID: <46BB36BB.4030708@midwinter.com> (raw)
In-Reply-To: <21FC6D7F-5459-406D-AA06-D16E525B3C17@lrde.epita.fr>
Benoit SIGOURE wrote:
> git-svn fetch
> git-checkout -b myb b
> git-rebase master
> git-svn dcommit # sends the commit to SVN branch `a' instead of SVN
> branch `b'!
That's exactly what I would expect to happen. The "git-rebase" is the
key here; it is effectively telling git to switch back to your master
branch. Try running "git log" before and after the rebase command and
you should get a slightly better idea of what's happening. Rebase is
kind of a tricky beast; a basic rule of thumb is that you should only
use it to go forward in time on a single upstream branch, not to hop
between upstream branches. Its behavior in non-forward-in-time cases is
predictable once you know how it works, but not necessarily intuitive.
What are you expecting rebase to do here? We can probably suggest some
other commands that will do what you're hoping to do. My hunch is that
you're trying to use it to effectively do a merge of your "a" and "b"
branches, but maybe I'm wrong about that.
-Steve
prev parent reply other threads:[~2007-08-09 15:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-08 21:35 Bug in git-svn: dcommit commits in the wrong branch after a rebase Benoit SIGOURE
2007-08-09 15:45 ` Benoit SIGOURE
2007-08-09 15:46 ` Steven Grimm [this message]
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=46BB36BB.4030708@midwinter.com \
--to=koreth@midwinter.com \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
--cc=tsuna@lrde.epita.fr \
/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).