equal
deleted
inserted
replaced
13 $ echo a >> a |
13 $ echo a >> a |
14 $ hg ci -qAm changea |
14 $ hg ci -qAm changea |
15 $ hg up -qC 0 |
15 $ hg up -qC 0 |
16 $ hg branch branch0 |
16 $ hg branch branch0 |
17 marked working directory as branch branch0 |
17 marked working directory as branch branch0 |
|
18 (branches are permanent and global, did you want a bookmark?) |
18 $ echo b > b |
19 $ echo b > b |
19 $ hg ci -qAm addb |
20 $ hg ci -qAm addb |
20 $ hg up -qC |
21 $ hg up -qC |
21 $ hg merge default |
22 $ hg merge default |
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
50 Add a merge with both parents and child in different branches |
51 Add a merge with both parents and child in different branches |
51 |
52 |
52 $ cd source |
53 $ cd source |
53 $ hg branch branch1 |
54 $ hg branch branch1 |
54 marked working directory as branch branch1 |
55 marked working directory as branch branch1 |
|
56 (branches are permanent and global, did you want a bookmark?) |
55 $ echo a > file1 |
57 $ echo a > file1 |
56 $ hg ci -qAm c1 |
58 $ hg ci -qAm c1 |
57 $ hg up -qC mergeab |
59 $ hg up -qC mergeab |
58 $ hg branch branch2 |
60 $ hg branch branch2 |
59 marked working directory as branch branch2 |
61 marked working directory as branch branch2 |
|
62 (branches are permanent and global, did you want a bookmark?) |
60 $ echo a > file2 |
63 $ echo a > file2 |
61 $ hg ci -qAm c2 |
64 $ hg ci -qAm c2 |
62 $ hg merge branch1 |
65 $ hg merge branch1 |
63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
64 (branch merge, don't forget to commit) |
67 (branch merge, don't forget to commit) |
65 $ hg branch branch3 |
68 $ hg branch branch3 |
66 marked working directory as branch branch3 |
69 marked working directory as branch branch3 |
|
70 (branches are permanent and global, did you want a bookmark?) |
67 $ hg ci -qAm c3 |
71 $ hg ci -qAm c3 |
68 $ cd .. |
72 $ cd .. |
69 |
73 |
70 incremental conversion |
74 incremental conversion |
71 |
75 |