Mercurial > hg
comparison tests/test-subrepo.t @ 26618:8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
We perform all that we can non-interactively before prompting the user for input
via their merge tool. This allows for a maximally consistent state when the user
is first prompted.
The test output changes indicate the actual behavior change happening.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sun, 11 Oct 2015 21:56:39 -0700 |
parents | ef1eb6df7071 |
children | 296d55def9c4 |
comparison
equal
deleted
inserted
replaced
26617:dfd9811c5c9b | 26618:8e6d5b7317e6 |
---|---|
257 $ hg merge 6 --debug # test change | 257 $ hg merge 6 --debug # test change |
258 searching for copies back to rev 2 | 258 searching for copies back to rev 2 |
259 resolving manifests | 259 resolving manifests |
260 branchmerge: True, force: False, partial: False | 260 branchmerge: True, force: False, partial: False |
261 ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 | 261 ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 |
262 .hgsubstate: versions differ -> m | 262 .hgsubstate: versions differ -> m (premerge) |
263 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec | 263 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
264 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg | 264 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
265 getting subrepo t | 265 getting subrepo t |
266 resolving manifests | 266 resolving manifests |
267 branchmerge: False, force: False, partial: False | 267 branchmerge: False, force: False, partial: False |
283 $ HGMERGE=internal:merge hg merge --debug 7 # test conflict | 283 $ HGMERGE=internal:merge hg merge --debug 7 # test conflict |
284 searching for copies back to rev 2 | 284 searching for copies back to rev 2 |
285 resolving manifests | 285 resolving manifests |
286 branchmerge: True, force: False, partial: False | 286 branchmerge: True, force: False, partial: False |
287 ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf | 287 ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf |
288 .hgsubstate: versions differ -> m | 288 .hgsubstate: versions differ -> m (premerge) |
289 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 | 289 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
290 subrepo t: both sides changed | 290 subrepo t: both sides changed |
291 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) | 291 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) |
292 (M)erge, keep (l)ocal or keep (r)emote? m | 292 (M)erge, keep (l)ocal or keep (r)emote? m |
293 merging subrepo t | 293 merging subrepo t |
294 searching for copies back to rev 2 | 294 searching for copies back to rev 2 |
295 resolving manifests | 295 resolving manifests |
296 branchmerge: True, force: False, partial: False | 296 branchmerge: True, force: False, partial: False |
297 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 | 297 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
298 preserving t for resolve of t | 298 preserving t for resolve of t |
299 t: versions differ -> m | 299 t: versions differ -> m (premerge) |
300 picked tool ':merge' for t (binary False symlink False) | 300 picked tool ':merge' for t (binary False symlink False) |
301 merging t | 301 merging t |
302 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a | 302 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
303 t: versions differ -> m (merge) | |
303 picked tool ':merge' for t (binary False symlink False) | 304 picked tool ':merge' for t (binary False symlink False) |
304 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a | 305 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
305 warning: conflicts while merging t! (edit, then use 'hg resolve --mark') | 306 warning: conflicts while merging t! (edit, then use 'hg resolve --mark') |
306 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 307 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
307 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 308 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |