comparison tests/test-subrepo.out @ 10431:ba5e508b5e92

update: make calls to ui.progress()
author Augie Fackler <durin42@gmail.com>
date Sun, 07 Feb 2010 17:44:30 -0600
parents 65a90c8e11ee
children 2250fc372d34
comparison
equal deleted inserted replaced
10430:5cef810e588f 10431:ba5e508b5e92
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 update: .hgsubstate 1/1 files (100.00%)
59 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec 60 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
60 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg 61 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
61 getting subrepo t 62 getting subrepo t
62 resolving manifests 63 resolving manifests
63 overwrite True partial False 64 overwrite True partial False
64 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a 65 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
65 t: remote is newer -> g 66 t: remote is newer -> g
67 update: t 1/1 files (100.00%)
66 getting t 68 getting t
67 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 69 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
68 (branch merge, don't forget to commit) 70 (branch merge, don't forget to commit)
69 path s 71 path s
70 source s 72 source s
76 searching for copies back to rev 2 78 searching for copies back to rev 2
77 resolving manifests 79 resolving manifests
78 overwrite None partial False 80 overwrite None partial False
79 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf 81 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
80 .hgsubstate: versions differ -> m 82 .hgsubstate: versions differ -> m
83 update: .hgsubstate 1/1 files (100.00%)
81 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 84 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
82 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg 85 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
83 merging subrepo t 86 merging subrepo t
84 searching for copies back to rev 2 87 searching for copies back to rev 2
85 resolving manifests 88 resolving manifests
86 overwrite None partial False 89 overwrite None partial False
87 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 90 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
88 t: versions differ -> m 91 t: versions differ -> m
89 preserving t for resolve of t 92 preserving t for resolve of t
93 update: t 1/1 files (100.00%)
90 picked tool 'internal:merge' for t (binary False symlink False) 94 picked tool 'internal:merge' for t (binary False symlink False)
91 merging t 95 merging t
92 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a 96 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
93 warning: conflicts during merge. 97 warning: conflicts during merge.
94 merging t failed! 98 merging t failed!