On Sat, Sep 15, 2007 at 05:24:02PM +0200, Lars Hjemli wrote: > On 9/15/07, Peter Baumann <waste.manager@xxxxxx> wrote: > > On Sat, Sep 15, 2007 at 04:08:31PM +0200, Lars Hjemli wrote: > > > 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. > > > > > > > What do you mean by editing the graft file? Remove (the wrong) parent > > from the merge commit by a graft? > > I imagined just changing the order of the parents. > Doh. I missed the obvious. -Peter - 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
