equal
deleted
inserted
replaced
10 updating to branch default |
10 updating to branch default |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12 |
12 |
13 $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1" |
13 $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1" |
14 $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo" |
14 $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo" |
15 $ hg -R foo1 pull -u |
15 $ hg -R foo1 pull |
16 pulling from $TESTTMP/foo (glob) |
16 pulling from $TESTTMP/foo (glob) |
17 searching for changes |
17 searching for changes |
18 adding changesets |
18 adding changesets |
19 adding manifests |
19 adding manifests |
20 adding file changes |
20 adding file changes |
21 added 1 changesets with 1 changes to 1 files (+1 heads) |
21 added 1 changesets with 1 changes to 1 files (+1 heads) |
22 abort: not updating: not a linear update |
22 (run 'hg heads' to see heads, 'hg merge' to merge) |
23 (merge or update --check to force update) |
|
24 [255] |
|
25 |
23 |
26 $ hg -R foo1 book branchy |
24 $ hg -R foo1 book branchy |
27 $ hg -R foo1 book |
25 $ hg -R foo1 book |
28 * branchy 1:e3e522925eff |
26 * branchy 1:e3e522925eff |
29 |
27 |