Mercurial > hg

comparison tests/test-subrepo.out @ 9783:ee00ef6f9be7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
submerge: properly deal with overwrites also pull .hgsubstate check out of inner loop
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Nov 2009 10:29:52 -0600
parents a3d73b3e1f8a
children 5ca0d220ae21 a19d2993385d
comparison
equal deleted inserted replaced
9782:c1c40511c276 9783:ee00ef6f9be7
54 searching for copies back to rev 2 54 searching for copies back to rev 2
55 resolving manifests 55 resolving manifests
56 overwrite None partial False 56 overwrite None partial False
57 ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 57 ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
58 .hgsubstate: versions differ -> m 58 .hgsubstate: versions differ -> m
59 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
60 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad
61 getting subrepo t
59 resolving manifests 62 resolving manifests
60 overwrite True partial False 63 overwrite True partial False
61 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a 64 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
62 t: remote is newer -> g 65 t: remote is newer -> g
63 getting t 66 getting t
73 searching for copies back to rev 2 76 searching for copies back to rev 2
74 resolving manifests 77 resolving manifests
75 overwrite None partial False 78 overwrite None partial False
76 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf 79 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
77 .hgsubstate: versions differ -> m 80 .hgsubstate: versions differ -> m
81 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
82 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4
83 merging subrepo t
78 searching for copies back to rev 2 84 searching for copies back to rev 2
79 resolving manifests 85 resolving manifests
80 overwrite None partial False 86 overwrite None partial False
81 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 87 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
82 t: versions differ -> m 88 t: versions differ -> m