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

Martin von Zweigbergk martinvonz at google.com
Wed Feb 3 21:08:35 UTC 2016


On Mon, Feb 1, 2016 at 8:32 PM, Siddharth Agarwal <sid0 at fb.com> wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1454387312 28800
> #      Mon Feb 01 20:28:32 2016 -0800
> # Node ID ec8a498d420032e72949af812909548980d5da75
> # Parent  6fdeaa578d463e43eb4167ddef6d388f40a735bc
> # Available At http://42.netv6.net/sid0-wip/hg/
> #              hg pull http://42.netv6.net/sid0-wip/hg/ -r ec8a498d4200
> merge: respect checkunknown and checkignored for force merges
>
> checkunknown and checkignored are currently respected for updates and regular
> merges, but not for certain kinds of rebases. To be precise, they aren't
> respected for rebases when:

When I read the subject line, I thought this was about "hg merge
--force". Would it be accurate to change it to "rebase: respect
checkunknown and checkignored"?


More information about the Mercurial-devel mailing list