Re: [Monotone-devel] Workflow with Monotone

[Nathaniel Smith]

On Sun, Jun 05, 2005 at 07:23:46PM +0200, Richard Levitte - VMS Whacker wrote:
> An option is to use disapprove on B.  This creates a new revision
> (direkt child of B) containing the "anti-patch" of B, and you can
> continue from there:
> 
>   A
>   |
>   B
>   |
>   Bd
>   |
>   C
> 
> And if you decide that B is worth picking up again, you can update to
> it and commit changes starting from it:
> 
>   A
>   |
>   B
>   | \
>   Bd  X
>   |
>   C

No, this doesn't work.  Part of the point of a disapprove is that it
will actually kill off the changes in question.  E.g., one use case is
that you have A -> B, you realize B sucks, and disapprove it, while
unbeknownst to you someone else has merrily updated to the latest head
(B), and has committed some new changes X.  Disapprove works correctly
in this case; when Bd and X later get merged, the bad B changes will
get stripped out of X, leaving whatever new changes were made.  This
is a feature.  Makes this case not work right, though.

What you want in this case is to disapprove the disapproval:

   A
   |
   B
   |
   Bd 
   | \
   C  Bdd (= B)
        \
         X

-- Nathaniel

-- 
Sentience can be such a burden.