Re: [Gnu-arch-users] Re: <<< conflict markers

[David Allouche]

On Fri, Apr 16, 2004 at 05:22:26PM -0400, Stefan Monnier wrote:
> >> > Using abbreviated syntax here.  Given:
> >> 
> >> >   /----------------tag-----------------\
> >> >  /                                      \
> >> > p5--commit--p6(bad)--commit--p7--commit  p8--commit--p9
> >> >                \             /                       /
> >> >                 \---delta---/                       /
> >> >                          \-------------apply----------/
> >> 
> >> But that's not as clean since you end up reverting p7 
> >> temporarily as well.
> 
> > Would the tag have to be committed before the apply-delta was done, or could
> > they be a single commit?
> 
> Ah... if it can be done in a single commit, then it's perfect.
> And it would then deserve some advertisement: at least as a "how to undo
> a bad commit" in the wiki or maybe as a sort of `tla undo-commit' command.

This strikes me as a variant of the "replay --reverse p6 ; commit"
solution, and it has the same problem: p6 would appear in "missing",
whereas we do not want it in.

The "replay --reverse p6; sync-tree `tree-version` ; commit" solution
fixes the "missing" output, and as far as any consensus has been
reached, it seems to be the recommended way to undo a bad patch.

-- 
                                                            -- ddaa