# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1336902475 -7200
# Node ID 26756d9d8143e18ddc998f491a8a016fa62a2e0c
# Parent  c285aae10f6c146e636b7ea84f9f9b3c49058beb
tests: make test-convert-darcs.t happier with darcs 2.8.0

diff -r c285aae10f6c -r 26756d9d8143 tests/test-convert-darcs.t
--- a/tests/test-convert-darcs.t	Sat May 12 17:00:01 2012 +0200
+++ b/tests/test-convert-darcs.t	Sun May 13 11:47:55 2012 +0200
@@ -32,7 +32,7 @@
 
 branch and update
 
-  $ darcs get darcs-repo darcs-clone >/dev/null
+  $ darcs get -q darcs-repo darcs-clone >/dev/null
   $ cd darcs-clone
   $ echo c >> a
   $ echo c > c
@@ -48,11 +48,10 @@
   $ darcs record -a -l -m p1.2
   Finished recording patch 'p1.2'
 
-  $ darcs pull -a --no-set-default ../darcs-clone
-  Backing up ./a(-darcs-backup0)
+  $ darcs pull -q -a --no-set-default ../darcs-clone
+  Backing up ./a(*) (glob)
   We have conflicts in the following files:
   ./a
-  Finished pulling and applying.
   $ sleep 1
   $ echo e > a
   $ echo f > f