Mercurial > hg
comparison tests/test-rebase-pull.out @ 7786:92455c1d6f83
rebase: pull --rebase updates if there is nothing to rebase
author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
---|---|
date | Sun, 18 Jan 2009 19:59:51 +0100 |
parents | 808f03f61ebe |
children | dd1b47e17d7e |
comparison
equal
deleted
inserted
replaced
7785:660c8dd44060 | 7786:92455c1d6f83 |
---|---|
1 updating working directory | |
2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1 updating working directory | 3 updating working directory |
2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 4 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3 | 5 |
4 % Now b has one revision to be pulled from a | 6 % Now b has one revision to be pulled from a |
5 pulling from | 7 pulling from |
28 % Re-run pull --rebase | 30 % Re-run pull --rebase |
29 pulling from | 31 pulling from |
30 searching for changes | 32 searching for changes |
31 no changes found | 33 no changes found |
32 | 34 |
33 % Invoke pull --rebase with --update | 35 % Invoke pull --rebase and nothing to rebase |
34 abort: --update and --rebase are not compatible | 36 pulling from |
37 searching for changes | |
38 adding changesets | |
39 adding manifests | |
40 adding file changes | |
41 added 1 changesets with 1 changes to 1 files | |
42 (run 'hg update' to get a working copy) | |
43 nothing to rebase | |
44 @ 2 | |
45 | | |
46 | |
47 % pull --rebase doesn't update if nothing has been pulled | |
48 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
49 pulling from | |
50 searching for changes | |
51 no changes found | |
52 o 2 | |
53 | |