From: Benoit SIGOURE <tsuna@lrde.epita.fr>
Date: Thu, 09 Aug 2007 15:45:38 GMT
Subject: Re: Bug in git-svn: dcommit commits in the wrong branch after a rebase
Message-ID: <6E86FCDA-F2A9-4516-8CE7-E1CC385FA9E2@lrde.epita.fr>
In-Reply-To: <21FC6D7F-5459-406D-AA06-D16E525B3C17@lrde.epita.fr>

On Aug 8, 2007, at 11:35 PM, Benoit SIGOURE wrote:

> Test case:
>
> svnadmin create repos
> svn co file://`pwd`/repos wc
> cd wc
> svn mkdir branches
> svn mkdir branches/a
> echo foo >branches/a/foo
> svn add branches/a/foo
> svn ci -m 'branch a'
> cd ..
> git-svn clone --branches=branches file://`pwd`/repos wc.git
> cd wc.git
> echo git is cool >>foo
> git-commit -a -m 'commit in git in branch a'
> cd ../wc
> svn cp branches/a branches/b
> svn ci -m 'branch b'
> cd ../wc.git
> 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'!
>

Actually the test case is wrong, it should end in:
git-rebase b # while being on `master' branch
git-svn dcommit # this works as expected

Thanks to siprbaum for spotting this on IRC.  Sorry for the noise.

-- 
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory