[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Stefan Monnier
Subject: [Gnu-arch-users] Re: <<< conflict markers
Date: 16 Apr 2004 17:22:26 -0400
User-agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50

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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]