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

[Parker, Ron]

> From: Stefan Monnier [mailto:address@hidden

> >> > 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.

Well, I have the perfect archive to test this on.  It has a bunch of
attempt-to-fix-auto* mis-steps that really don't need to be pulled down by
anyone that may want the final working version of the archive.  If I have
time I will give it a shot over the weekend and report back on Monday.