This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9029

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

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

Details

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

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Sep 17 2020, 5:50 AM
pulkit added a commit: rHG8c02c6262a5e: tests: add some more debugmergestate calls in `test-merge-criss-cross.t`.Sep 28 2020, 7:21 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8c02c6262a5e: tests: add some more 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 (26 lines)

Diff 22674

tests/test-merge-criss-cross.t

$ 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")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ ls -1 $ ls -1
other-file other-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in 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, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("merge-keeping-the-file-from-deleted")' $ hg merge 'desc("merge-keeping-the-file-from-deleted")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in 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-keeping-the-file-from-updated")' $ hg merge 'desc("merge-keeping-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ ls -1 $ ls -1
other-file other-file
$ hg debugmergestate
no merge state found
(merging two deletion together → no conflict) (merging two deletion together → no conflict)
$ hg update --clean 'desc("merge-deleting-the-file-from-updated")' $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
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("merge-deleting-the-file-from-deleted")' $ hg merge 'desc("merge-deleting-the-file-from-deleted")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ ls -1 $ ls -1
other-file other-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-deleting-the-file-from-updated")' $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
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("merge-keeping-the-file-from-deleted")' $ hg merge 'desc("merge-keeping-the-file-from-deleted")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-deleting-the-file-from-updated")' $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
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-keeping-the-file-from-updated")' $ hg merge 'desc("merge-keeping-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ ls -1 $ ls -1
other-file other-file
$ hg debugmergestate
no merge state found
(merging two "keeping" together → no conflict) (merging two "keeping" together → no conflict)
$ hg update --clean 'desc("merge-keeping-the-file-from-updated")' $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
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("merge-keeping-the-file-from-deleted")' $ hg merge 'desc("merge-keeping-the-file-from-deleted")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
local (working copy): 5e3eccec60d88f94a7ba57c351f32cb24c15fe0c
other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
extra: the-file (filenode-source = other)
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-keeping-the-file-from-updated")' $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
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("merge-deleted-the-file-from-deleted")' $ hg merge 'desc("merge-deleted-the-file-from-deleted")'
abort: empty revision set abort: empty revision set
[255] [255]
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-keeping-the-file-from-updated")' $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
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("merge-deleting-the-file-from-updated")' $ hg merge 'desc("merge-deleting-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found
(merging two "keeping" together → no conflict) (merging two "keeping" together → no conflict)
$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")' $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'
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("merge-keeping-the-file-from-updated")' $ hg merge 'desc("merge-keeping-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")' $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'
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("merge-deleted-the-file-from-deleted")' $ hg merge 'desc("merge-deleted-the-file-from-deleted")'
abort: empty revision set abort: empty revision set
[255] [255]
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")' $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'
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("merge-deleting-the-file-from-updated")' $ hg merge 'desc("merge-deleting-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found