Re: Bug in git-svn: dcommit commits in the wrong branch after a rebase

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Benoit SIGOURE <tsuna@...>
Cc: <git@...>, Eric Wong <normalperson@...>
Date: Thursday, August 9, 2007 - 11:46 am

Benoit SIGOURE wrote:

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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: Bug in git-svn: dcommit commits in the wrong branch afte..., Steven Grimm, (Thu Aug 9, 11:46 am)