Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-subrepo.out Sun Feb 07 12:00:40 2010 -0600 +++ b/tests/test-subrepo.out Sun Feb 07 17:44:30 2010 -0600 @@ -56,6 +56,7 @@ overwrite None partial False ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 .hgsubstate: versions differ -> m +update: .hgsubstate 1/1 files (100.00%) subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg getting subrepo t @@ -63,6 +64,7 @@ overwrite True partial False ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a t: remote is newer -> g +update: t 1/1 files (100.00%) getting t 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -78,6 +80,7 @@ overwrite None partial False ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf .hgsubstate: versions differ -> m +update: .hgsubstate 1/1 files (100.00%) subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg merging subrepo t @@ -87,6 +90,7 @@ ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 t: versions differ -> m preserving t for resolve of t +update: t 1/1 files (100.00%) picked tool 'internal:merge' for t (binary False symlink False) merging t my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a