equal
deleted
inserted
replaced
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 -u |
16 pulling from $TESTTMP/foo |
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) |
27 |
27 |
28 Pull. Bookmark should not jump to new head. |
28 Pull. Bookmark should not jump to new head. |
29 |
29 |
30 $ echo "there" >> foo/a && hg -R foo commit -m "edited a again" |
30 $ echo "there" >> foo/a && hg -R foo commit -m "edited a again" |
31 $ hg -R foo1 pull |
31 $ hg -R foo1 pull |
32 pulling from $TESTTMP/foo |
32 pulling from $TESTTMP/foo (glob) |
33 searching for changes |
33 searching for changes |
34 adding changesets |
34 adding changesets |
35 adding manifests |
35 adding manifests |
36 adding file changes |
36 adding file changes |
37 added 1 changesets with 1 changes to 1 files |
37 added 1 changesets with 1 changes to 1 files |