[PATCH 1 of 2 STABLE RFC] subrepo: update test output for issue1977 fix

Wagner Bruna wagner.bruna+mercurial at gmail.com
Fri Apr 30 18:18:53 CDT 2010


# HG changeset patch
# User Wagner Bruna <wbruna at softwareexpress.com.br>
# Date 1272667775 10800
# Branch stable
# Node ID e6510842d526825ffb970b28d4961c0988ff84d6
# Parent  2212934b3bae49548e28712c627e2bcb7639c0fd
subrepo: update test output for issue1977 fix

diff --git a/tests/test-subrepo.out b/tests/test-subrepo.out
--- a/tests/test-subrepo.out
+++ b/tests/test-subrepo.out
@@ -163,14 +163,6 @@
 pushing ...subrepo s
 searching for changes
 (did you forget to merge? use push -f to force)
-pushing ...subrepo t
-searching for changes
-no changes found
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 pushing ...sub/t
 pushing ...subrepo ss
 searching for changes
@@ -185,7 +177,10 @@
 searching for changes
 no changes found
 searching for changes
-no changes found
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
 % update
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 committing subrepository t


More information about the Mercurial-devel mailing list