Mercurial > evolve
changeset 1737:5383671ef612
evolve: fix test breaks related to double->single quote changes
| author | Kostia Balytskyi <ikostia@fb.com> |
|---|---|
| date | Thu, 22 Sep 2016 09:15:30 -0700 |
| parents | c9a79b432907 |
| children | cb5edd4b160c |
| files | tests/test-evolve.t tests/test-exchange-A3.t tests/test-sharing.t tests/test-stabilize-result.t |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve.t Tue Sep 13 01:25:17 2016 +0200 +++ b/tests/test-evolve.t Thu Sep 22 09:15:30 2016 -0700 @@ -1126,7 +1126,7 @@ summary summarize working directory state update update working directory (or switch revisions) - (use "hg help" for the full list of commands or "hg -v" for details) + (use 'hg help' for the full list of commands or 'hg -v' for details) [255] $ hg fold hg: unknown command 'fold' @@ -1152,7 +1152,7 @@ summary summarize working directory state update update working directory (or switch revisions) - (use "hg help" for the full list of commands or "hg -v" for details) + (use 'hg help' for the full list of commands or 'hg -v' for details) [255] Enabling commands selectively, only fold enabled, next is still unknown $ cat >> $HGRCPATH <<EOF @@ -1188,7 +1188,7 @@ summary summarize working directory state update update working directory (or switch revisions) - (use "hg help" for the full list of commands or "hg -v" for details) + (use 'hg help' for the full list of commands or 'hg -v' for details) [255] Restore all of the evolution features
--- a/tests/test-exchange-A3.t Tue Sep 13 01:25:17 2016 +0200 +++ b/tests/test-exchange-A3.t Thu Sep 22 09:15:30 2016 -0700 @@ -168,7 +168,7 @@ pushing to pushdest searching for changes abort: push creates new remote head e5ea8f9c7314! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ cd ..
--- a/tests/test-sharing.t Tue Sep 13 01:25:17 2016 +0200 +++ b/tests/test-sharing.t Thu Sep 22 09:15:30 2016 -0700 @@ -342,7 +342,7 @@ searching for changes remote has heads on branch 'default' that are not known locally: 540ba8f317e6 abort: push creates new remote head cbdfbd5a5db2 with bookmark 'bug15'! - (pull and merge or see "hg help push" for details about pushing new heads) + (pull and merge or see 'hg help push' for details about pushing new heads) [255] $ hg pull ../public pulling from ../public
--- a/tests/test-stabilize-result.t Tue Sep 13 01:25:17 2016 +0200 +++ b/tests/test-stabilize-result.t Thu Sep 22 09:15:30 2016 -0700 @@ -98,7 +98,7 @@ +newer a $ hg evolve --continue grafting 5:3655f0f50885 "newer a" - abort: unresolved merge conflicts (see "hg help resolve") + abort: unresolved merge conflicts (see 'hg help resolve') [255] $ hg resolve -m a (no more unresolved files)