This is an archive of the discontinued Mercurial Phabricator instance.

Differential D809

uncommit: add a test for uncommit with uncommitondirtywdir config in merge
ClosedPublic

Authored by pulkit on Sep 24 2017, 10:08 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGae510d9691ef: uncommit: add a test for uncommit with uncommitondirtywdir config in merge

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 24 2017, 10:08 AM
yuja accepted this revision.Sep 25 2017, 9:54 AM
yuja added a subscriber: yuja.

Queued, thanks.

This revision is now accepted and ready to land.Sep 25 2017, 9:54 AM
Closed by commit rHGae510d9691ef: uncommit: add a test for uncommit with uncommitondirtywdir config in merge (authored by pulkit). · Explain WhySep 25 2017, 11:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-uncommit.t (4 lines)

Diff 2064

tests/test-uncommit.t

$ hg merge 2 $ hg merge 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
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg uncommit $ hg uncommit
abort: outstanding uncommitted merge abort: outstanding uncommitted merge
[255] [255]
$ hg uncommit --config experimental.uncommitondirtywdir=True
abort: cannot uncommit while merging
[255]
$ hg status $ hg status
M a M a
$ hg commit -m 'merge a and b' $ hg commit -m 'merge a and b'
$ hg uncommit $ hg uncommit
abort: cannot uncommit merge changeset abort: cannot uncommit merge changeset
[255] [255]