197 $ hg ci -m9 |
197 $ hg ci -m9 |
198 created new head |
198 created new head |
199 $ hg merge 6 --debug # test change |
199 $ hg merge 6 --debug # test change |
200 searching for copies back to rev 2 |
200 searching for copies back to rev 2 |
201 resolving manifests |
201 resolving manifests |
202 overwrite None partial False |
202 overwrite: False, partial: False |
203 ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 |
203 ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 |
204 .hgsubstate: versions differ -> m |
204 .hgsubstate: versions differ -> m |
205 updating: .hgsubstate 1/1 files (100.00%) |
205 updating: .hgsubstate 1/1 files (100.00%) |
206 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
206 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
207 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
207 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
208 getting subrepo t |
208 getting subrepo t |
209 resolving manifests |
209 resolving manifests |
210 overwrite True partial False |
210 overwrite: True, partial: False |
211 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a |
211 ancestor: 60ca1237c194+, local: 60ca1237c194+, remote: 6747d179aa9a |
212 t: remote is newer -> g |
212 t: remote is newer -> g |
213 updating: t 1/1 files (100.00%) |
213 updating: t 1/1 files (100.00%) |
214 getting t |
214 getting t |
215 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
215 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
216 (branch merge, don't forget to commit) |
216 (branch merge, don't forget to commit) |
225 $ hg ci -m10 |
225 $ hg ci -m10 |
226 committing subrepository t |
226 committing subrepository t |
227 $ HGMERGE=internal:merge hg merge --debug 7 # test conflict |
227 $ HGMERGE=internal:merge hg merge --debug 7 # test conflict |
228 searching for copies back to rev 2 |
228 searching for copies back to rev 2 |
229 resolving manifests |
229 resolving manifests |
230 overwrite None partial False |
230 overwrite: False, partial: False |
231 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf |
231 ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf |
232 .hgsubstate: versions differ -> m |
232 .hgsubstate: versions differ -> m |
233 updating: .hgsubstate 1/1 files (100.00%) |
233 updating: .hgsubstate 1/1 files (100.00%) |
234 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
234 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
235 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
235 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
236 merging subrepo t |
236 merging subrepo t |
237 searching for copies back to rev 2 |
237 searching for copies back to rev 2 |
238 resolving manifests |
238 resolving manifests |
239 overwrite None partial False |
239 overwrite: False, partial: False |
240 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 |
240 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
241 t: versions differ -> m |
241 t: versions differ -> m |
242 preserving t for resolve of t |
242 preserving t for resolve of t |
243 updating: t 1/1 files (100.00%) |
243 updating: t 1/1 files (100.00%) |
244 picked tool 'internal:merge' for t (binary False symlink False) |
244 picked tool 'internal:merge' for t (binary False symlink False) |
245 merging t |
245 merging t |