[PATCH 5 of 6 checkunknown] merge: respect checkunknown and checkignored for force merges

[Martin von Zweigbergk]

On Mon, Feb 8, 2016 at 2:29 PM, Siddharth Agarwal <sid at less-broken.com> wrote:
> On 2/3/16 14:01, Martin von Zweigbergk wrote:
>>
>> On Mon, Feb 1, 2016 at 8:32 PM, Siddharth Agarwal <sid0 at fb.com> wrote:
>>>
>>> @@ -114,15 +125,21 @@ D onto F - intermediate point:
>>>
>>>
>>>   E onto H - skip of G:
>>> +(this also tests that we can overwrite untracked files and don't create
>>> backups
>>> +if they have the same contents)
>>>
>>>     $ hg clone -q -u . a a3
>>>     $ cd a3
>>> +  $ hg cat -r 4 E | tee E
>>
>> This "tee" call doesn't seem necessary. Should it be?
>
>
> It's necessary -- it causes the file E to be written out to disk. That's
> what's used in the next part of the test.

Oh, of course, it's checking that no backup file is created if the
content is the same, so there's no difference in output if it's
removed, but it's also not testing what it should. Thanks for
clarifying.