[PATCH 5 of 5] merge: add more thorough tests for --force

[Martin von Zweigbergk]

On Sun Nov 30 2014 at 10:21:54 PM Martin von Zweigbergk <
martinvonz at google.com> wrote:
>
> +Some files get added (e.g. content1_content2_content1_content1-untracked)
> +
> +It is not intuitive that content1_content2_content1_content4-tracked gets
> +merged while content1_content2_content1_content4-untracked gets
> overwritten.
> +Any *_content2_*-untracked triggers the modified/deleted prompt and then
> gets
> +overwritten.
> +
> +A lot of untracked files become tracked, for example
> +content1_content2_content2_content2-untracked.
> +
> +*_missing_missing_missing-tracked is reported as removed ('R'), which
> +doesn't make sense since the file did not exist in the parent, but on the
> +other hand, merged-in additions are reported as modifications, which is
> +almost as strange.
> +
> +missing_missing_content3_missing-tracked becomes removed ('R'), even
> though
> +the remote side did not touch the file
>

The above is just my brain dump while looking through the output; please
view especially this part of the patch as RFC.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20141201/af17af98/attachment.html>