( )⚙ D1284 tests: fix test-tweakdefaults-update.t test failures

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1284

tests: fix test-tweakdefaults-update.t test failures
ClosedPublic

Authored by swhitaker on Nov 2 2017, 10:01 AM.
Tags
None
Subscribers
None

Details

Reviewers
mjpieters
Group Reviewers
Restricted Project
Commits
rFBHGX59313126fd5e: tests: fix test-tweakdefaults-update.t test failures
Test Plan

rt test-tweakdefaults-update.t

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

swhitaker created this revision.Nov 2 2017, 10:01 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 2 2017, 10:01 AM
mjpieters accepted this revision.Nov 2 2017, 10:04 AM
This revision is now accepted and ready to land.Nov 2 2017, 10:04 AM
Closed by commit rFBHGX59313126fd5e: tests: fix test-tweakdefaults-update.t test failures (authored by swhitaker). · Explain WhyNov 2 2017, 3:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-tweakdefaults-update.t (6 lines)

Diff 3225

tests/test-tweakdefaults-update.t

$ hg up 4 --check $ hg up 4 --check
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ hg up --merge 4 $ hg up --merge 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
Certain flags shouldn't work together. Certain flags shouldn't work together.
$ hg up --check --merge 3 $ hg up --check --merge 3
abort: can only specify one of -C/--clean, -c/--check, or -m/merge abort: can only specify one of -C/--clean, -c/--check, or -m/--merge
[255] [255]
$ hg up --check --clean 3 $ hg up --check --clean 3
abort: can only specify one of -C/--clean, -c/--check, or -m/merge abort: can only specify one of -C/--clean, -c/--check, or -m/--merge
[255] [255]
$ hg up --clean --merge 3 $ hg up --clean --merge 3
abort: can only specify one of -C/--clean, -c/--check, or -m/merge abort: can only specify one of -C/--clean, -c/--check, or -m/--merge
[255] [255]
--clean should work as expected. --clean should work as expected.
$ hg st $ hg st
A foo A foo
$ hg up --clean 3 $ hg up --clean 3
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 st $ hg st
? foo ? foo
$ hg update ".^" $ hg update ".^"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(hint: use 'hg prev' to move to the parent changeset) (hint: use 'hg prev' to move to the parent changeset)