This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7666

update: add some tests for the status quo of morestatus on update conflicts
ClosedPublic

Authored by rdamazio on Dec 14 2019, 12:49 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5709a9992c2a: update: add some tests for the status quo of morestatus on update conflicts

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mtests/test-update-branches.t (46 lines)

Diff 18723

tests/test-update-branches.t

$ cat >> $HGRCPATH <<EOF
> [commands]
> status.verbose=1
> EOF
# Construct the following history tree: # Construct the following history tree:
# #
# @ 5:e1bb631146ca b1 # @ 5:e1bb631146ca b1
# | # |
# o 4:a4fdb3b883c4 0:b608b9236435 b1 # o 4:a4fdb3b883c4 0:b608b9236435 b1
# | # |
# | o 3:4b57d2520816 1:44592833ba9f # | o 3:4b57d2520816 1:44592833ba9f
# | | # | |
[255] [255]
$ hg up -m 4 $ hg up -m 4
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ rm a.orig $ rm a.orig
$ hg status
M a
$ hg resolve -l
U a
Change/delete conflict is not allowed Change/delete conflict is not allowed
$ hg up -qC 3 $ hg up -qC 3
$ hg rm foo $ hg rm foo
$ hg up -q 4 $ hg up -q 4
Uses default value of "linear" when value is misspelled Uses default value of "linear" when value is misspelled
$ echo 'update.check = linyar' >> .hg/hgrc $ echo 'update.check = linyar' >> .hg/hgrc
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
(leaving bookmark bm) (leaving bookmark bm)
updated to hidden changeset 6efa171f091b updated to hidden changeset 6efa171f091b
(hidden revision '6efa171f091b' was rewritten as: d047485b3896) (hidden revision '6efa171f091b' was rewritten as: d047485b3896)
[1] [1]
Test that statuses are reported properly before and after merge resolution.
$ rm a.orig
$ hg resolve -l
U a
$ hg status
M a
M foo
$ hg revert -r . a $ hg revert -r . a
$ rm a.orig
$ hg resolve -l
U a
$ hg status
M foo
$ hg status -Tjson
[
{
"itemtype": "file",
"path": "foo",
"status": "M"
}
]
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
$ hg resolve -l
R a
$ hg status
M foo
$ hg status -Tjson
[
{
"itemtype": "file",
"path": "foo",
"status": "M"
}
]
Test that 4 is detected as the no-argument destination from 3 and also moves Test that 4 is detected as the no-argument destination from 3 and also moves
the bookmark with it the bookmark with it
$ hg up --quiet 0 # we should be able to update to 3 directly $ hg up --quiet 0 # we should be able to update to 3 directly
$ hg up --quiet --hidden 3 # but not implemented yet. $ hg up --quiet --hidden 3 # but not implemented yet.
updated to hidden changeset 6efa171f091b updated to hidden changeset 6efa171f091b
(hidden revision '6efa171f091b' was rewritten as: d047485b3896) (hidden revision '6efa171f091b' was rewritten as: d047485b3896)
$ hg book -f bm $ hg book -f bm
$ hg up $ hg up