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

[Parker, Ron]

> From: Stefan Monnier [mailto:address@hidden

> > In fact, I think it would be quite handy to kill bad 
> > revisions by simply tagging their ancestor into the 
> > current version, so you get this:
> 
> > patch-5 --commit---patch-6 (bad)      patch-7---commit---patch-8
> >      \                                /
> >       \---------------tag------------/
> 
> Neat!
> Too bad it doesn't work so cleanly if some other (non-bad) patch-7 was
> committed before you realized you wanted to kill patch-6.

Using abbreviated syntax here.  Given:

  /----------------tag-----------------\
 /                                      \
p5--commit--p6(bad)--commit--p7--commit  p8--commit--p9
               \             /                       /
                \---delta---/                       /
                            \-------------apply----------/

Would this work for a non-bad patch-7?  Tag patch-5 back in as patch-8,
commit, and then apply-delta patch-6-through-patch-7 as patch 9?

If it would work what is the proper way to find a patch's immediate ancestor
and descendent?