|
1 adding foo |
|
2 marked working directory as branch branchA |
|
3 pulling from ../t |
|
4 requesting all changes |
|
5 adding changesets |
|
6 adding manifests |
|
7 adding file changes |
|
8 added 2 changesets with 2 changes to 1 files |
|
9 (run 'hg update' to get a working copy) |
|
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 % create branch B |
|
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 marked working directory as branch branchB |
|
14 created new head |
|
15 % a new branch is there |
|
16 pulling from ../t |
|
17 searching for changes |
|
18 adding changesets |
|
19 adding manifests |
|
20 adding file changes |
|
21 added 2 changesets with 2 changes to 1 files (+1 heads) |
|
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 % develop both branch |
|
24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
25 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
26 % should succeed, no new heads |
|
27 pulling from ../t |
|
28 searching for changes |
|
29 adding changesets |
|
30 adding manifests |
|
31 adding file changes |
|
32 added 2 changesets with 2 changes to 1 files |
|
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
34 % add an head on other branch |
|
35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
38 created new head |
|
39 % should succeed only one head on our branch |
|
40 pulling from ../t |
|
41 searching for changes |
|
42 adding changesets |
|
43 adding manifests |
|
44 adding file changes |
|
45 added 3 changesets with 3 changes to 1 files (+1 heads) |
|
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
47 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 created new head |
|
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
51 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
52 % should fail new head in our branch |
|
53 pulling from ../t |
|
54 searching for changes |
|
55 adding changesets |
|
56 adding manifests |
|
57 adding file changes |
|
58 added 4 changesets with 4 changes to 1 files (+1 heads) |
|
59 not updating, since new heads added |
|
60 (run 'hg heads' to see heads, 'hg merge' to merge) |