On 9/5/07, Eric Wong <normalperson@xxxxxxxx> wrote: > Lars Hjemli <hjemli@xxxxxxxxx> wrote: > > When git-svn uses git-log to find embedded 'git-svn-id'-lines in commit > > messages, it can get confused when local history contains merges with > > other git-svn branches. But if --first-parent is supplied to git-log, > > working_head_info() will only see 'branch-local' commits and thus the > > first commit containing a 'git-svn-id' line should refer to the correct > > subversion branch. > > Ideally, we'd probably stop, say something and give the user the choice > of branches if multiple parents available. Could you elaborate? (I don't understand how following the first parent of a merge could end up at the wrong svn branch) -- larsh - 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
