equal
deleted
inserted
replaced
53 Add a merge with both parents and child in different branches |
53 Add a merge with both parents and child in different branches |
54 |
54 |
55 $ cd source |
55 $ cd source |
56 $ hg branch branch1 |
56 $ hg branch branch1 |
57 marked working directory as branch branch1 |
57 marked working directory as branch branch1 |
58 (branches are permanent and global, did you want a bookmark?) |
|
59 $ echo a > file1 |
58 $ echo a > file1 |
60 $ hg ci -qAm c1 |
59 $ hg ci -qAm c1 |
61 $ hg up -qC mergeab |
60 $ hg up -qC mergeab |
62 $ hg branch branch2 |
61 $ hg branch branch2 |
63 marked working directory as branch branch2 |
62 marked working directory as branch branch2 |
64 (branches are permanent and global, did you want a bookmark?) |
|
65 $ echo a > file2 |
63 $ echo a > file2 |
66 $ hg ci -qAm c2 |
64 $ hg ci -qAm c2 |
67 $ hg merge branch1 |
65 $ hg merge branch1 |
68 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 |
69 (branch merge, don't forget to commit) |
67 (branch merge, don't forget to commit) |
70 $ hg branch branch3 |
68 $ hg branch branch3 |
71 marked working directory as branch branch3 |
69 marked working directory as branch branch3 |
72 (branches are permanent and global, did you want a bookmark?) |
|
73 $ hg ci -qAm c3 |
70 $ hg ci -qAm c3 |
74 $ cd .. |
71 $ cd .. |
75 |
72 |
76 incremental conversion |
73 incremental conversion |
77 |
74 |