Mercurial > evolve
changeset 1746:343298df3f26 mercurial-3.9
integrate code update and test change from future 5.5 code
This prove that the code is compatible with 3.9
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 28 Oct 2016 16:03:00 +0200 |
| parents | db0a54205221 (diff) 6c922448ccec (current diff) |
| children | b0a67ebc464e 5526e97928d7 |
| files | tests/test-evolve.t tests/test-exchange-A3.t tests/test-prev-next.t tests/test-sharing.t tests/test-simple4server.t tests/test-stabilize-result.t |
| diffstat | 6 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve.t Fri Oct 28 15:44:15 2016 +0200 +++ b/tests/test-evolve.t Fri Oct 28 16:03:00 2016 +0200 @@ -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 Fri Oct 28 15:44:15 2016 +0200 +++ b/tests/test-exchange-A3.t Fri Oct 28 16:03:00 2016 +0200 @@ -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-prev-next.t Fri Oct 28 15:44:15 2016 +0200 +++ b/tests/test-prev-next.t Fri Oct 28 16:03:00 2016 +0200 @@ -221,7 +221,7 @@ $ hg amend --edit & $ sleep 1 $ hg prev - waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) + waiting for lock on working directory of $TESTTMP/repo held by '*' (glob) got lock after [4-6] seconds (re) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [0] one @@ -230,7 +230,7 @@ $ hg amend --edit & $ sleep 1 $ hg next --evolve - waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) + waiting for lock on working directory of $TESTTMP/repo held by '*' (glob) 1 new unstable changesets got lock after [4-6] seconds (re) move:[2] two
--- a/tests/test-sharing.t Fri Oct 28 15:44:15 2016 +0200 +++ b/tests/test-sharing.t Fri Oct 28 16:03:00 2016 +0200 @@ -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-simple4server.t Fri Oct 28 15:44:15 2016 +0200 +++ b/tests/test-simple4server.t Fri Oct 28 16:03:00 2016 +0200 @@ -8,7 +8,7 @@ > [phases] > publish = False > [experimental] - > bundle2-exp=False # < Mercurial-4.0 + > bundle2-exp=False > [devel] > legacy.exchange=bundle1 > [extensions]
--- a/tests/test-stabilize-result.t Fri Oct 28 15:44:15 2016 +0200 +++ b/tests/test-stabilize-result.t Fri Oct 28 16:03:00 2016 +0200 @@ -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)