[PATCH] test-merge-tools: fix flaky test by avoiding debugsetparents

[Pierre-Yves David]

On 02/11/2015 12:24 AM, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1423613835 28800
> #      Tue Feb 10 16:17:15 2015 -0800
> # Node ID 4bba350e6e54c663a0763870bcd7a6f95857f601
> # Parent  415414caf43924082eeab9ef1ce329cb2ab1f8eb
> test-merge-tools: fix flaky test by avoiding debugsetparents
>
> debugsetparents is a debug command and does not provide the same
> guarantees as non-debug commands do. In particular, when the user sets
> a different parent, any clean files will remain clean in the dirstate
> even though the new parent might have a different version of the file
> (so it should appear modified compared to the new parent).

This happen to be a very common mistake of fool playing with 
debugsetparent. Given that such fool also seems fairly common, should we 
add a warning to this debugcommand?

-- 
Pierre-Yves David