[PATCH] test-rename-merge2: make selected output less arbitrary

Siddharth Agarwal sid at less-broken.com
Mon Nov 16 20:58:50 CST 2015


On 11/16/15 17:17, Pierre-Yves David wrote:
>
>
> On 11/10/2015 10:24 AM, Martin von Zweigbergk wrote:
>> # HG changeset patch
>> # User Martin von Zweigbergk <martinvonz at google.com>
>> # Date 1423722149 28800
>> #      Wed Feb 11 22:22:29 2015 -0800
>> # Node ID ff9bb137520a37a6825a5c98915f42cc10a4758d
>> # Parent  8b2fbe3f59b1b969878691cb472369ad0067f165
>> test-rename-merge2: make selected output less arbitrary
>>
>> It's unclear why everything from the first 'updating:' line should be
>> ignored. The arbitrariness makes it confusing that changing the code
>> so e.g. the 'getting 8/f' line is printed later makes it disappear
>> completely from the ouput. The list of 'preserving x for resolve of y'
>> seems convered by the subsequent for loop in the test case. Perhaps
>> it's only copies that are of interests, so let's keep only that part.
>
> Siddharth, do you have an opinion on what this test tests and the 
> correctness of this patch?

Yeah, I agree it makes sense.




More information about the Mercurial-devel mailing list