Geek Answers Handbook

Git-svn tries to commit the wrong branch

git-svn dcommittrying to push the wrong SVN branch. Here is what I did:

git checkout -b branch_a svn/branch_a  # git-svn clone prepended all remote SVN branches with svn/
git svn branch -m "a message" branch_b
git checkout -b branch_b svn/branch_b

<make some commits>

git svn dcommit
git checkout branch_a
git svn rebase
git checkout branch_b
git rebase branch_a

This is the “right” branch / merge strategy that I interpret from this StackOverflow question.

Now I'm in the brine. git svn dcommitof branch_btrying to click on the svn url for svn/branch_a. This is confirmed by the exit git svn info. This is also not what I want or expect.

Interestingly, it git log --grep='^git-svn-id:' --first-parent -1shows the correct SVN branch, the url for svn/branch_b. I read that this command should show where git-svn will be dcommit to.

So:

  • What have I done wrong?
  • How can I fix it (i.e. click branch_bonsvn/branch_b
+5
source share
1 answer

, , git svn SVN. :

git checkout -b branch_a -t svn/branch_a
git checkout -b branch_b -t svn/branch_b

, :

git svn info

.

+1

More articles:


All Articles