58 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
58 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
59 src: '1' -> dst: '1a' * |
59 src: '1' -> dst: '1a' * |
60 checking for directory renames |
60 checking for directory renames |
61 resolving manifests |
61 resolving manifests |
62 branchmerge: True, force: False, partial: False |
62 branchmerge: True, force: False, partial: False |
63 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
63 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96 |
64 preserving 1a for resolve of 1a |
64 preserving 1a for resolve of 1a |
65 starting 4 threads for background file closing (?) |
65 starting 4 threads for background file closing (?) |
66 1a: local copied/moved from 1 -> m (premerge) |
66 1a: local copied/moved from 1 -> m (premerge) |
67 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
67 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
68 merging 1a and 1 to 1a |
68 merging 1a and 1 to 1a |
69 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@c64f439569a9 |
69 my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9 |
70 premerge successful |
70 premerge successful |
71 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
71 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
72 (branch merge, don't forget to commit) |
72 (branch merge, don't forget to commit) |
73 |
73 |
74 $ hg co -C 4 |
74 $ hg co -C 4 |
80 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
80 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
81 src: '1' -> dst: '1a' * |
81 src: '1' -> dst: '1a' * |
82 checking for directory renames |
82 checking for directory renames |
83 resolving manifests |
83 resolving manifests |
84 branchmerge: True, force: False, partial: False |
84 branchmerge: True, force: False, partial: False |
85 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
85 ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b |
86 preserving 1 for resolve of 1a |
86 preserving 1 for resolve of 1a |
87 removing 1 |
87 removing 1 |
88 starting 4 threads for background file closing (?) |
88 starting 4 threads for background file closing (?) |
89 1a: remote moved from 1 -> m (premerge) |
89 1a: remote moved from 1 -> m (premerge) |
90 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
90 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
91 merging 1 and 1a to 1a |
91 merging 1 and 1a to 1a |
92 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@c64f439569a9 |
92 my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9 |
93 premerge successful |
93 premerge successful |
94 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
94 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
95 (branch merge, don't forget to commit) |
95 (branch merge, don't forget to commit) |
96 |
96 |