--- a/tests/test-subrepo.out Thu Dec 31 17:19:30 2009 -0600
+++ b/tests/test-subrepo.out Thu Dec 31 17:10:03 2009 -0600
@@ -57,7 +57,7 @@
ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
.hgsubstate: versions differ -> m
subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
- subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad
+ subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
getting subrepo t
resolving manifests
overwrite True partial False
@@ -79,7 +79,7 @@
ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
.hgsubstate: versions differ -> m
subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
- subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4
+ subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
merging subrepo t
searching for copies back to rev 2
resolving manifests
@@ -201,3 +201,5 @@
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
blah
+% bogus subrepo path aborts
+abort: missing ] in subrepo source