This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8987

tests: add few debugrevlogindex and a log call to see changes in next test
ClosedPublic

Authored by pulkit on Sep 5 2020, 3:10 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG76b69f81629c: tests: add few debugrevlogindex and a log call to see changes in next test
Summary

In upcoming patches, we will create a new filenode in couple of cases. Let's add
some debugrevlogindex and a log call so that we can observe those changes
better.

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

pulkit created this revision.Sep 5 2020, 3:10 AM
marmoute accepted this revision.Sep 11 2020, 5:08 AM
marmoute added a subscriber: marmoute.

Looks good.

Maybe explaining why "this should create a new file node" would better.

pulkit added a commit: rHG76b69f81629c: tests: add few debugrevlogindex and a log call to see changes in next test.Sep 28 2020, 7:20 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG76b69f81629c: tests: add few debugrevlogindex and a log call to see changes in next test (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-merge-criss-cross.t (42 lines)

Diff 22871

tests/test-merge-criss-cross.t

$ hg update 'desc("delete-the-file")' $ hg update 'desc("delete-the-file")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("updating-both-file")' -t :local $ hg merge 'desc("updating-both-file")' -t :local
1 files updated, 1 files merged, 0 files removed, 0 files unresolved 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "merge-deleting-the-file-from-deleted" $ hg ci -m "merge-deleting-the-file-from-deleted"
$ hg manifest $ hg manifest
other-file other-file
$ hg debugrevlogindex the-file
rev linkrev nodeid p1 p2
0 0 4b69178b9bda 000000000000 000000000000
1 1 59e363a07dc8 4b69178b9bda 000000000000
$ hg update 'desc("updating-both-file")' $ hg update 'desc("updating-both-file")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("delete-the-file")' -t :other $ hg merge 'desc("delete-the-file")' -t :other
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "merge-deleting-the-file-from-updated" $ hg ci -m "merge-deleting-the-file-from-updated"
created new head created new head
$ hg manifest $ hg manifest
other-file other-file
$ hg debugrevlogindex the-file
rev linkrev nodeid p1 p2
0 0 4b69178b9bda 000000000000 000000000000
1 1 59e363a07dc8 4b69178b9bda 000000000000
$ hg update 'desc("delete-the-file")' $ hg update 'desc("delete-the-file")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("updating-both-file")' -t :other $ hg merge 'desc("updating-both-file")' -t :other
1 files updated, 1 files merged, 0 files removed, 0 files unresolved 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "merge-keeping-the-file-from-deleted" $ hg ci -m "merge-keeping-the-file-from-deleted"
created new head created new head
$ hg manifest $ hg manifest
other-file other-file
the-file the-file
XXX: This should create a new filenode because user explicitly decided to keep
the file. If we reuse the same filenode, future merges (criss-cross ones mostly)
will think that file remain unchanged and user explicit choice will not be taken
in consideration.
$ hg debugrevlogindex the-file
rev linkrev nodeid p1 p2
0 0 4b69178b9bda 000000000000 000000000000
1 1 59e363a07dc8 4b69178b9bda 000000000000
$ hg update 'desc("updating-both-file")' $ hg update 'desc("updating-both-file")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("delete-the-file")' -t :local $ hg merge 'desc("delete-the-file")' -t :local
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "merge-keeping-the-file-from-updated" $ hg ci -m "merge-keeping-the-file-from-updated"
created new head created new head
$ hg manifest $ hg manifest
other-file other-file
the-file the-file
XXX: This should create a new filenode because user explicitly decided to keep
the file. If we reuse the same filenode, future merges (criss-cross ones mostly)
will think that file remain unchanged and user explicit choice will not be taken
in consideration.
$ hg debugrevlogindex the-file
rev linkrev nodeid p1 p2
0 0 4b69178b9bda 000000000000 000000000000
1 1 59e363a07dc8 4b69178b9bda 000000000000
$ hg log -G -T '{node|short} {desc}\n'
@ 5e3eccec60d8 merge-keeping-the-file-from-updated
|\
+---o e9b708131723 merge-keeping-the-file-from-deleted
| |/
+---o a4e0e44229dc merge-deleting-the-file-from-updated
| |/
+---o adfd88e5d7d3 merge-deleting-the-file-from-deleted
| |/
| o 7801bc9b9899 delete-the-file
| |
o | 9b610631ab29 updating-both-file
|/
o 955800955977 root-commit
There the resulting merge together (leading to criss cross situation). Check There the resulting merge together (leading to criss cross situation). Check
the conflict is properly detected. the conflict is properly detected.
(merging two deletion together → no conflict) (merging two deletion together → no conflict)
$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")' $ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("merge-deleting-the-file-from-updated")' $ hg merge 'desc("merge-deleting-the-file-from-updated")'