equal
deleted
inserted
replaced
35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
36 $ echo 'b' >b |
36 $ echo 'b' >b |
37 $ hg add b |
37 $ hg add b |
38 $ hg branch b |
38 $ hg branch b |
39 marked working directory as branch b |
39 marked working directory as branch b |
40 (branches are permanent and global, did you want a bookmark?) |
|
41 $ hg commit -m "Adding b branch" |
40 $ hg commit -m "Adding b branch" |
42 $ heads |
41 $ heads |
43 2: Adding b branch (b) |
42 2: Adding b branch (b) |
44 1: Adding a branch (a) |
43 1: Adding a branch (a) |
45 0: Adding root node () |
44 0: Adding root node () |
117 |
116 |
118 $ echo 'c' >c |
117 $ echo 'c' >c |
119 $ hg add c |
118 $ hg add c |
120 $ hg branch c |
119 $ hg branch c |
121 marked working directory as branch c |
120 marked working directory as branch c |
122 (branches are permanent and global, did you want a bookmark?) |
|
123 $ hg commit -m "Adding c branch" |
121 $ hg commit -m "Adding c branch" |
124 $ heads |
122 $ heads |
125 7: Adding c branch (c) |
123 7: Adding c branch (c) |
126 6: Merging b branch head 2 and b branch head 3 (b) |
124 6: Merging b branch head 2 and b branch head 3 (b) |
127 3: Adding b branch head 1 (b) |
125 3: Adding b branch head 1 (b) |
300 Case NN: msg |
298 Case NN: msg |
301 |
299 |
302 $ hg up -q null |
300 $ hg up -q null |
303 $ hg branch -f b |
301 $ hg branch -f b |
304 marked working directory as branch b |
302 marked working directory as branch b |
305 (branches are permanent and global, did you want a bookmark?) |
|
306 $ echo 1 > bb |
303 $ echo 1 > bb |
307 $ hg ci -Am "b4 (NN): new topo root for branch b" |
304 $ hg ci -Am "b4 (NN): new topo root for branch b" |
308 adding bb |
305 adding bb |
309 created new head |
306 created new head |
310 |
307 |
315 |
312 |
316 Case BN: msg |
313 Case BN: msg |
317 |
314 |
318 $ hg branch -f default |
315 $ hg branch -f default |
319 marked working directory as branch default |
316 marked working directory as branch default |
320 (branches are permanent and global, did you want a bookmark?) |
|
321 $ echo 1 > aa |
317 $ echo 1 > aa |
322 $ hg ci -Am "a6 (BN): new branch root" |
318 $ hg ci -Am "a6 (BN): new branch root" |
323 adding aa |
319 adding aa |
324 created new head |
320 created new head |
325 |
321 |
335 |
331 |
336 $ hg up -q 4 |
332 $ hg up -q 4 |
337 $ hg merge -q 3 |
333 $ hg merge -q 3 |
338 $ hg branch -f default |
334 $ hg branch -f default |
339 marked working directory as branch default |
335 marked working directory as branch default |
340 (branches are permanent and global, did you want a bookmark?) |
|
341 $ hg ci -m "a8 (BB): weird new branch root" |
336 $ hg ci -m "a8 (BB): weird new branch root" |
342 created new head |
337 created new head |
343 |
338 |
344 Case CB: msg |
339 Case CB: msg |
345 |
340 |