diff options
Diffstat (limited to 'tests/test-rebase-pull.t')
| -rw-r--r-- | tests/test-rebase-pull.t | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t index 07388d5..ff8ab75 100644 --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -48,7 +48,7 @@ Now b has one revision to be pulled from a: $ hg pull --rebase - pulling from $TESTTMP/a (glob) + pulling from $TESTTMP/a searching for changes adding changesets adding manifests @@ -68,7 +68,7 @@ Now b has one revision to be pulled from a: Re-run: $ hg pull --rebase - pulling from $TESTTMP/a (glob) + pulling from $TESTTMP/a searching for changes no changes found @@ -77,9 +77,8 @@ Invoke pull --rebase and nothing to rebase: $ cd ../c - $ hg book norebase $ hg pull --rebase - pulling from $TESTTMP/a (glob) + pulling from $TESTTMP/a searching for changes adding changesets adding manifests @@ -87,7 +86,6 @@ Invoke pull --rebase and nothing to rebase: added 1 changesets with 1 changes to 1 files nothing to rebase 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updating bookmark norebase $ hg tglog -l 1 @ 2: 'R1' @@ -96,7 +94,7 @@ Invoke pull --rebase and nothing to rebase: pull --rebase --update should ignore --update: $ hg pull --rebase --update - pulling from $TESTTMP/a (glob) + pulling from $TESTTMP/a searching for changes no changes found @@ -105,7 +103,7 @@ pull --rebase doesn't update if nothing has been pulled: $ hg up -q 1 $ hg pull --rebase - pulling from $TESTTMP/a (glob) + pulling from $TESTTMP/a searching for changes no changes found @@ -113,4 +111,3 @@ pull --rebase doesn't update if nothing has been pulled: o 2: 'R1' | - $ cd .. |