On 9/7/07, Lars Hjemli <hjemli@xxxxxxxxx> wrote: > On 9/7/07, Peter Baumann <waste.manager@xxxxxx> wrote: > > lets reset 'trunk' to its state before the merge and > > 'branch1' to the merge commit, before fixing the bug in 'branch1'. > > > > a-b-c-d-e trunk > > \ \ > > \ -x-y m branch1 > > Yeah, this would certainly not be handled correctly by dcommit using > --first-parent (but it could be handled by (a correct implementation > of) --upstream). Actually, I don't think there's any way to handle this correctly. The current git-svn will do the right thing except in cases like the one you described, and in these cases it can be _forced_ to do the right thing by editing the grafts file, so I'll drop the whole --upstream idea. -- 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
