This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9028

tests: add some debugmergestate calls in `test-merge-criss-cross.t`
ClosedPublic

Authored by pulkit on Sep 17 2020, 5:49 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG463ca8af8c72: tests: add some debugmergestate calls in `test-merge-criss-cross.t`
Summary

This will help notice the change in upcoming patches much 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 17 2020, 5:49 AM
pulkit added a commit: rHG463ca8af8c72: tests: add some debugmergestate calls in `test-merge-criss-cross.t`.Sep 28 2020, 7:20 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG463ca8af8c72: tests: add some debugmergestate calls in `test-merge-criss-cross.t` (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 (34 lines)

Diff 22872

tests/test-merge-criss-cross.t

Do all the merge combination (from the deleted or the update side × keeping and deleting the file Do all the merge combination (from the deleted or the update side × keeping and deleting the file
$ 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 debugmergestate
local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071
file: the-file (state "r")
local path: the-file (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)
extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
extra: other-file (filenode-source = other)
$ 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 $ hg debugrevlogindex the-file
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 0 4b69178b9bda 000000000000 000000000000 0 0 4b69178b9bda 000000000000 000000000000
1 1 59e363a07dc8 4b69178b9bda 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 debugmergestate
local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071
other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
file: the-file (state "r")
local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")
ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
other path: the-file (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
$ 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 $ hg debugrevlogindex the-file
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 0 4b69178b9bda 000000000000 000000000000 0 0 4b69178b9bda 000000000000 000000000000
1 1 59e363a07dc8 4b69178b9bda 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 debugmergestate
local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071
file: the-file (state "r")
local path: the-file (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)
extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
extra: other-file (filenode-source = other)
$ 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 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) 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 will think that file remain unchanged and user explicit choice will not be taken
in consideration. in consideration.
$ hg debugrevlogindex the-file $ hg debugrevlogindex the-file
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 0 4b69178b9bda 000000000000 000000000000 0 0 4b69178b9bda 000000000000 000000000000
1 1 59e363a07dc8 4b69178b9bda 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 debugmergestate
local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071
other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
file: the-file (state "r")
local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")
ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
other path: the-file (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
$ 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 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) the file. If we reuse the same filenode, future merges (criss-cross ones mostly)