In D8029#118463, @marmoute wrote:

Coudl we use a flag for to hg copy for that ? something like hg copy --forget

Reviewers: This patch is independent of D7827, so please don't let that patch block this one.

Pretty sure this was made obsolete by D6255

In D8021#118342, @martinvonz wrote:

Queuing based on @yuja's review.

Queuing based on @yuja's review.

I'd be very happy to queue this as soon as @mharbison72's request for Windows has been addressed (I think that was all, right?). We (Google) would like to use it for macOS packaging too. We may also end up using it on Linux so we don't break when the system python3 changes from 3.7 of 3.8 (because we currently install .so files specific to a minor Python version, IIUC). Thanks a lot for your work on this, @indygreg. And thanks for reviewing and testing it, @mharbison72.

In D7993#118162, @yuja wrote:

+ cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview')

It's a bit late, but I feel the arguments of check_incompatible_arguments()
is confusing since b'abort' isn't the same kind of arguments as the others.
I think (opts, b'abort', [b'rev', b'preview']) is more explicit.

In D7996#117951, @martinvonz wrote:

In D7996#117931, @pulkit wrote:

Looks like we don't have tests for hg merge 'wdir()'. Also I am not sure what should be the correct behavior in that case.

Yes, I just didn't care enough to add tests. I don't care much because it's such a weird thing for the user to do. I changed this only in order to clarify the control flow and how node gets assigned. I can add a test if you want.

In D7996#117931, @pulkit wrote:

Looks like we don't have tests for hg merge 'wdir()'. Also I am not sure what should be the correct behavior in that case.

I'll insert another patch with another fun test case before this patch soon