equal
deleted
inserted
replaced
17 requesting all changes |
17 requesting all changes |
18 adding changesets |
18 adding changesets |
19 adding manifests |
19 adding manifests |
20 adding file changes |
20 adding file changes |
21 added 2 changesets with 2 changes to 1 files |
21 added 2 changesets with 2 changes to 1 files |
|
22 new changesets 495a0ec48aaf:50e089d141b7 |
22 (run 'hg update' to get a working copy) |
23 (run 'hg update' to get a working copy) |
23 $ hg up branchA |
24 $ hg up branchA |
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 |
25 |
26 |
26 $ cd ../t |
27 $ cd ../t |
45 searching for changes |
46 searching for changes |
46 adding changesets |
47 adding changesets |
47 adding manifests |
48 adding manifests |
48 adding file changes |
49 adding file changes |
49 added 2 changesets with 2 changes to 1 files (+1 heads) |
50 added 2 changesets with 2 changes to 1 files (+1 heads) |
|
51 new changesets 9f878dea0b96:5be59ce5067b |
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
52 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
51 |
53 |
52 Develop both branches: |
54 Develop both branches: |
53 |
55 |
54 $ cd ../t |
56 $ cd ../t |
70 searching for changes |
72 searching for changes |
71 adding changesets |
73 adding changesets |
72 adding manifests |
74 adding manifests |
73 adding file changes |
75 adding file changes |
74 added 2 changesets with 2 changes to 1 files |
76 added 2 changesets with 2 changes to 1 files |
|
77 new changesets 7c8fe7e20c32:453e93fa00a5 |
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
76 |
79 |
77 Add a head on other branch: |
80 Add a head on other branch: |
78 |
81 |
79 $ cd ../t |
82 $ cd ../t |
100 searching for changes |
103 searching for changes |
101 adding changesets |
104 adding changesets |
102 adding manifests |
105 adding manifests |
103 adding file changes |
106 adding file changes |
104 added 3 changesets with 3 changes to 1 files (+1 heads) |
107 added 3 changesets with 3 changes to 1 files (+1 heads) |
|
108 new changesets da3a8a0161c6:b61cab8fe4e8 |
105 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
109 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
106 |
110 |
107 $ cd ../t |
111 $ cd ../t |
108 $ hg up -C branchA |
112 $ hg up -C branchA |
109 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
113 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
130 searching for changes |
134 searching for changes |
131 adding changesets |
135 adding changesets |
132 adding manifests |
136 adding manifests |
133 adding file changes |
137 adding file changes |
134 added 4 changesets with 4 changes to 1 files (+1 heads) |
138 added 4 changesets with 4 changes to 1 files (+1 heads) |
|
139 new changesets 0c4d148ae29e:ecfc3f4a6fd9 |
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
140 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
136 updated to "d740e1a584e7: a5.2" |
141 updated to "d740e1a584e7: a5.2" |
137 1 other heads for branch "branchA" |
142 1 other heads for branch "branchA" |
138 |
143 |
139 Make changes on new branch on tt |
144 Make changes on new branch on tt |
162 searching for changes |
167 searching for changes |
163 adding changesets |
168 adding changesets |
164 adding manifests |
169 adding manifests |
165 adding file changes |
170 adding file changes |
166 added 1 changesets with 1 changes to 1 files (+1 heads) |
171 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
172 new changesets 7d8ffa4c0b22 |
167 (run 'hg heads' to see heads) |
173 (run 'hg heads' to see heads) |
168 |
174 |
169 Make changes on default and branchC on tt |
175 Make changes on default and branchC on tt |
170 |
176 |
171 $ cd ../tt |
177 $ cd ../tt |
174 searching for changes |
180 searching for changes |
175 adding changesets |
181 adding changesets |
176 adding manifests |
182 adding manifests |
177 adding file changes |
183 adding file changes |
178 added 1 changesets with 1 changes to 1 files (+1 heads) |
184 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
185 new changesets 2b94b54b6b5f |
179 (run 'hg heads' to see heads) |
186 (run 'hg heads' to see heads) |
180 $ hg up -C default |
187 $ hg up -C default |
181 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
188 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
182 $ echo a1 > bar1 |
189 $ echo a1 > bar1 |
183 $ hg ci -Am "commit on default on tt" |
190 $ hg ci -Am "commit on default on tt" |
209 searching for changes |
216 searching for changes |
210 adding changesets |
217 adding changesets |
211 adding manifests |
218 adding manifests |
212 adding file changes |
219 adding file changes |
213 added 2 changesets with 2 changes to 2 files (+2 heads) |
220 added 2 changesets with 2 changes to 2 files (+2 heads) |
|
221 new changesets eed40c14b407:e634733b0309 |
214 (run 'hg heads .' to see heads, 'hg merge' to merge) |
222 (run 'hg heads .' to see heads, 'hg merge' to merge) |
215 |
223 |
216 $ cd .. |
224 $ cd .. |