This is an archive of the discontinued Mercurial Phabricator instance.

copies: fix an incorrect comment in graftcopies() from recent D9802
ClosedPublic

Authored by martinvonz on Jan 28 2021, 3:19 AM.

Details

Summary

I don't think the bit about creating a merge in the filelog was
correct. Or at least I couldn't find a case where it happened.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 28 2021, 3:19 AM

What would be in that empty commit ?

What would be in that empty commit ?

A the new manifest's nodeid (which has the same content as the parent manifest, just different parent).

What would be in that empty commit ?

A the new manifest's nodeid (which has the same content as the parent manifest, just different parent).

If I remember correctly, that different nodeid is a file-revision that contains copy information ? Does it not ?

What would be in that empty commit ?

A the new manifest's nodeid (which has the same content as the parent manifest, just different parent).

If I remember correctly, that different nodeid is a file-revision that contains copy information ? Does it not ?

I didn't see any new file nodeids get created in the test case I looked at (around test-rebase-rename.t:135).

marmoute accepted this revision.Jan 28 2021, 12:03 PM

What would be in that empty commit ?

A the new manifest's nodeid (which has the same content as the parent manifest, just different parent).

If I remember correctly, that different nodeid is a file-revision that contains copy information ? Does it not ?

I didn't see any new file nodeids get created in the test case I looked at (around test-rebase-rename.t:135).

Hum right, my bad. I don't know where/if I actually such change…

Lets take that rephrasing.

pulkit accepted this revision.Jan 28 2021, 1:12 PM
This revision is now accepted and ready to land.Jan 28 2021, 1:12 PM