Re: git svn dcommit sends to wrong branch

From: badgerhardy <andrew.hardy@gl-group.com>
Date: Jan 26, 2012, 15:27 UTC
Message-ID: <1327591658546-7227251.post@n2.nabble.com>
In-Reply-To: <877h0yz269.fsf@thomas.inf.ethz.ch>

Thomas Rast wrote

Show 26 quoted lines

> 
> Victor Engmark &lt;victor.engmark@&gt; writes:
> 
> The rule is that the commits go to the branch named in the git-svn-id
> line of the most recent first-parent ancestor of HEAD.
> 
> You can find the "base" commit in question with
> 
>   git log -1 --first-parent --grep=^git-svn-id:
> 
>> And more importantly, how do I "replay" my commits on trunk?
> 
> You need to rebase the commits on trunk, and (very important) strip the
> git-svn-id lines from their messages.  If you only had a handful of
> commits, your best bet is to use something like
> 
>   git checkout -b newbranch
>   git rebase -i --onto svn/trunk svn/branch_name  # or whatever git-svn
> named the remote branches
>   # edit all the 'pick' into 'reword'
>   # in every commit message editor that pops up, remove the git-svn-id
> line
> 
>   gitk  # make sure that you like the resulting history!
>   git svn dcommit
>

I had the same problem and have followed these instructions (thanks!). I now have a 'newbranch' that will correctly dcommit to the svn trunk. What happens to the git 'master'? Is this recoverable or do I need to delete it and rename the 'newbranch' as master?

Thanks,

-- View this message in context: http://git.661346.n2.nabble.com/git-svn-dcommit-sends-to-wrong-branch-tp7172744p7227251.html Sent from the git mailing list archive at Nabble.com.