make manifest-merging test reproduceable

tests/test-manifest-merging

@@ -1,34 +1,34
 #!/bin/sh
 
 echo % init foo-base
 hg init foo-base
 
 echo % create alpha in first repo
 cd foo-base
 echo 'alpha' > alpha
 hg ci -A -m 'add alpha' -d '1 0'
 cd ..
 
 echo % clone foo-base to foo-work
 hg clone foo-base foo-work
 
 echo % create beta in second repo
 cd foo-work
 echo 'beta' > beta
 hg ci -A -m 'add beta' -d '2 0'
 cd ..
 
 echo % create gamma in first repo
 cd foo-base
 echo 'gamma' > gamma
 hg ci -A -m 'add gamma' -d '3 0'
 cd ..
 
 echo % pull into work and merge
 cd foo-work
-hg pull
+hg pull -q
 hg merge
 
 echo % revert to changeset 1 to simulate a failed merge
 rm -fr *
 hg up -C 1

tests/test-manifest-merging.out

@@ -1,21 +1,14
 % init foo-base
 % create alpha in first repo
 adding alpha
 % clone foo-base to foo-work
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % create beta in second repo
 adding beta
 % create gamma in first repo
 adding gamma
 % pull into work and merge
-pulling from /tmp/hgtests.H64eVH/test-manifest-merging/foo-base
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files (+1 heads)
-(run 'hg heads' to see heads, 'hg merge' to merge)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % revert to changeset 1 to simulate a failed merge
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved