81 searching for copies back to rev 2 |
81 searching for copies back to rev 2 |
82 resolving manifests |
82 resolving manifests |
83 overwrite None partial False |
83 overwrite None partial False |
84 ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 |
84 ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 |
85 .hgsubstate: versions differ -> m |
85 .hgsubstate: versions differ -> m |
86 update: .hgsubstate 1/1 files (100.00%) |
86 updating: .hgsubstate 1/1 files (100.00%) |
87 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
87 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
88 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
88 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
89 getting subrepo t |
89 getting subrepo t |
90 resolving manifests |
90 resolving manifests |
91 overwrite True partial False |
91 overwrite True partial False |
92 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a |
92 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a |
93 t: remote is newer -> g |
93 t: remote is newer -> g |
94 update: t 1/1 files (100.00%) |
94 updating: t 1/1 files (100.00%) |
95 getting t |
95 getting t |
96 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
96 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
97 (branch merge, don't forget to commit) |
97 (branch merge, don't forget to commit) |
98 path s |
98 path s |
99 source s |
99 source s |
105 searching for copies back to rev 2 |
105 searching for copies back to rev 2 |
106 resolving manifests |
106 resolving manifests |
107 overwrite None partial False |
107 overwrite None partial False |
108 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf |
108 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf |
109 .hgsubstate: versions differ -> m |
109 .hgsubstate: versions differ -> m |
110 update: .hgsubstate 1/1 files (100.00%) |
110 updating: .hgsubstate 1/1 files (100.00%) |
111 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
111 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
112 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
112 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
113 merging subrepo t |
113 merging subrepo t |
114 searching for copies back to rev 2 |
114 searching for copies back to rev 2 |
115 resolving manifests |
115 resolving manifests |
116 overwrite None partial False |
116 overwrite None partial False |
117 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 |
117 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 |
118 t: versions differ -> m |
118 t: versions differ -> m |
119 preserving t for resolve of t |
119 preserving t for resolve of t |
120 update: t 1/1 files (100.00%) |
120 updating: t 1/1 files (100.00%) |
121 picked tool 'internal:merge' for t (binary False symlink False) |
121 picked tool 'internal:merge' for t (binary False symlink False) |
122 merging t |
122 merging t |
123 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
123 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
124 warning: conflicts during merge. |
124 warning: conflicts during merge. |
125 merging t failed! |
125 merging t failed! |