Mercurial > hg
comparison tests/test-rebase-pull.out @ 6906:808f03f61ebe
Add rebase extension
author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
---|---|
date | Mon, 18 Aug 2008 21:16:31 +0200 |
parents | |
children | 92455c1d6f83 |
comparison
equal
deleted
inserted
replaced
6905:248e54a9456e | 6906:808f03f61ebe |
---|---|
1 updating working directory | |
2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | |
4 % Now b has one revision to be pulled from a | |
5 pulling from | |
6 searching for changes | |
7 adding changesets | |
8 adding manifests | |
9 adding file changes | |
10 added 1 changesets with 1 changes to 1 files (+1 heads) | |
11 (run 'hg heads' to see heads, 'hg merge' to merge) | |
12 saving bundle to | |
13 adding branch | |
14 adding changesets | |
15 adding manifests | |
16 adding file changes | |
17 added 2 changesets with 2 changes to 2 files | |
18 rebase completed | |
19 @ 3:L1 | |
20 | | |
21 o 2:R1 | |
22 | | |
23 o 1:C2 | |
24 | | |
25 o 0:C1 | |
26 | |
27 | |
28 % Re-run pull --rebase | |
29 pulling from | |
30 searching for changes | |
31 no changes found | |
32 | |
33 % Invoke pull --rebase with --update | |
34 abort: --update and --rebase are not compatible |