On Mon, Sep 17, 2007 at 02:23:38PM +0100, Johannes Schindelin wrote: > Hi, > > On Mon, 17 Sep 2007, Lars Hjemli wrote: > > > When 'git-svn dcommit' decides which commits it should push back > > subversion, it scans the output from 'git-log --first-parent HEAD' > > looking for embedded 'git-svn-id' lines. These lines contain the url > > of the upstream subversion repository + the subversion revision > > number. > > > So the problem with fast-forward merges of subversion branches is that > > the output from 'git-log --first-parent HEAD' will show commits from the > > wrong subversion branch (the fast-forwarded commits). > > Ah, I think I know what you're trying to get at. But "git svn fetch && > git rebase git-svn" might be a better approach [...] BTW, this is spelled "git svn rebase" these days. -chris - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
