( )⚙ D822 scm-prompt: update test for changed hg output

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D822

scm-prompt: update test for changed hg output
ClosedPublic

Authored by ryanmce on Sep 27 2017, 5:08 AM.
Tags
None
Subscribers
None

Details

Reviewers
stash
Group Reviewers
Restricted Project
Commits
rFBHGXddf5f22e3827: scm-prompt: update test for changed hg output

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

ryanmce created this revision.Sep 27 2017, 5:08 AM
stash accepted this revision.Sep 27 2017, 9:23 AM
This revision is now accepted and ready to land.Sep 27 2017, 9:23 AM
Closed by commit rFBHGXddf5f22e3827: scm-prompt: update test for changed hg output (authored by ryanmce). · Explain WhySep 27 2017, 9:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-scm-prompt-hg.t (2 lines)

Diff 2114

tests/test-scm-prompt-hg.t

| |
| o 775bfdddc842 c2 | o 775bfdddc842 c2
|/ |/
o 5cad84d1726f c1 o 5cad84d1726f c1
Test rebase Test rebase
$ cmd hg rebase -d 775bfdd --config "extensions.rebase=" $ cmd hg rebase -d 775bfdd --config "extensions.rebase="
rebasing 2:4b6cc7d5194b "c3" (tip active) rebasing 2:4b6cc7d5194b "c3" (active tip)
merging b merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
(775bfdd|REBASE) (775bfdd|REBASE)
$ cmd hg book rebase $ cmd hg book rebase
(rebase|REBASE) (rebase|REBASE)
$ cmd hg rebase --abort --config "extensions.rebase=" $ cmd hg rebase --abort --config "extensions.rebase="
rebase aborted rebase aborted