[Monotone-devel] Re: Merging an ancestor with one of its grandchildren

[Bruce Stephens]

Zbynek Winkler <address@hidden> writes:

> Tom Koelman wrote:
>
>> [snip]
>>
>>So I ended up committing a trivial change to B, creating B3 and then
>>merged Z to B3. This felt really hacky and I don't like this
>>solution. Was there a better one?
>>  
>>
> I would have done
>
>        monotone propagate NewFeature Main

If that's what merge ought to do in that case, then maybe it could
just do it, or at least suggest it in the error message.  

>From what I remember of the code in propagate, at least the latter is
likely to be a trivial change; probably the former would be not too
hard.  In both cases I'd guess the only significant effort is
constructing tests.

[...]