[darcs-devel] [patch1716] fix and simplify checkUnrecordedConflicts

[Ganesh Sittampalam]

On 09/10/2018 17:54, Ben Franksen wrote:
> Am 05.10.2018 um 08:43 schrieb Ganesh Sittampalam:
>> A trivial point, in pull.sh, you added this comment:
>>
>>> # this is now recognized as a conflict with working:
>>
>> It'd be better to omit the word "now" as it really refers
>> to this transition rather than a single snapshot of the
>> code.
> 
> You are absolutely right with that. I wonder how to do better, though.
> Do you think it makes sense to add the hash of the patch in a comment,
> e.g. would this be better:
> 
> # after patch 0b30a12378c874d1cc9ed41a537e80810d3ed755
> # this is recognized as a conflict with working:

I think the patch descriptions are enough for this information - either
include logically connected changes together in which case the
history of the new comment is self-explanatory, or refer to the
first patch in the second patch's description.

Ganesh