This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11848

update: use long version of the flag in the test
ClosedPublic

Authored by marmoute on Dec 3 2021, 9:10 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGacdd4a42deaa: update: use long version of the flag in the test
Summary

This helps readability and searchability.

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

marmoute created this revision.Dec 3 2021, 9:10 AM
Alphare accepted this revision.Dec 3 2021, 9:14 AM
This revision is now accepted and ready to land.Dec 3 2021, 9:14 AM
marmoute added a commit: rHGacdd4a42deaa: update: use long version of the flag in the test.Dec 3 2021, 9:52 AM
Closed by commit rHGacdd4a42deaa: update: use long version of the flag in the test (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 31299

tests/test-update-branches.t

M foo M foo
$ revtest 'none dirtysub cross' dirtysub 3 4 $ revtest 'none dirtysub cross' dirtysub 3 4
abort: uncommitted changes abort: uncommitted changes
(commit or update --clean to discard changes) (commit or update --clean to discard changes)
parent=3 parent=3
M sub/suba M sub/suba
$ revtest '-C dirty linear' dirty 1 2 -C $ revtest '--clean dirty linear' dirty 1 2 --clean
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2 parent=2
$ revtest '-c dirty linear' dirty 1 2 -c $ revtest '--check dirty linear' dirty 1 2 --check
abort: uncommitted changes abort: uncommitted changes
parent=1 parent=1
M foo M foo
$ revtest '-m dirty linear' dirty 1 2 -m $ revtest '--merge dirty linear' dirty 1 2 --merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2 parent=2
M foo M foo
$ revtest '-m dirty cross' dirty 3 4 -m $ revtest '--merge dirty cross' dirty 3 4 --merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=4 parent=4
M foo M foo
$ revtest '-c dirtysub linear' dirtysub 1 2 -c $ revtest '--check dirtysub linear' dirtysub 1 2 --check
abort: uncommitted changes in subrepository "sub" abort: uncommitted changes in subrepository "sub"
parent=1 parent=1
M sub/suba M sub/suba
$ norevtest '-c clean same' clean 2 -c $ norevtest '--check clean same' clean 2 -c
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "bd10386d478c: 2" updated to "bd10386d478c: 2"
1 other heads for branch "default" 1 other heads for branch "default"
parent=2 parent=2
$ revtest '-cC dirty linear' dirty 1 2 -cC $ revtest '--check --clean dirty linear' dirty 1 2 "--check --clean"
abort: cannot specify both --clean and --check abort: cannot specify both --clean and --check
parent=1 parent=1
M foo M foo
$ revtest '-mc dirty linear' dirty 1 2 -mc $ revtest '--merge -checkc dirty linear' dirty 1 2 "--merge --check"
abort: cannot specify both --check and --merge abort: cannot specify both --check and --merge
parent=1 parent=1
M foo M foo
$ revtest '-mC dirty linear' dirty 1 2 -mC $ revtest '--merge -clean dirty linear' dirty 1 2 "--merge --clean"
abort: cannot specify both --clean and --merge abort: cannot specify both --clean and --merge
parent=1 parent=1
M foo M foo
$ echo '[commands]' >> .hg/hgrc $ echo '[commands]' >> .hg/hgrc
$ echo 'update.check = abort' >> .hg/hgrc $ echo 'update.check = abort' >> .hg/hgrc
$ revtest 'none dirty linear' dirty 1 2 $ revtest 'none dirty linear' dirty 1 2
abort: uncommitted changes abort: uncommitted changes
parent=1 parent=1
M foo M foo
$ revtest 'none dirty linear' dirty 1 2 -c $ revtest 'none dirty linear' dirty 1 2 --check
abort: uncommitted changes abort: uncommitted changes
parent=1 parent=1
M foo M foo
$ revtest 'none dirty linear' dirty 1 2 -C $ revtest '--merge none dirty linear' dirty 1 2 --check
abort: uncommitted changes
parent=1
M foo
$ revtest 'none dirty linear' dirty 1 2 --clean
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2 parent=2
$ echo 'update.check = none' >> .hg/hgrc $ echo 'update.check = none' >> .hg/hgrc
$ revtest 'none dirty cross' dirty 3 4 $ revtest 'none dirty cross' dirty 3 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=4 parent=4
M foo M foo
$ revtest 'none dirty linear' dirty 1 2 $ revtest 'none dirty linear' dirty 1 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2 parent=2
M foo M foo
$ revtest 'none dirty linear' dirty 1 2 -c $ revtest 'none dirty linear' dirty 1 2 --check
abort: uncommitted changes abort: uncommitted changes
parent=1 parent=1
M foo M foo
$ revtest 'none dirty linear' dirty 1 2 -C $ revtest 'none dirty linear' dirty 1 2 --clean
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2 parent=2
$ hg co -qC 3 $ hg co -qC 3
$ echo dirty >> a $ echo dirty >> a
$ hg co --tool :merge3 4 $ hg co --tool :merge3 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')