[PATCH resend] tests: make test-convert-darcs.t happier with darcs 2.8.0

Bryan O'Sullivan bos at serpentine.com
Sat May 12 04:13:07 CDT 2012


# HG changeset patch
# User Bryan O'Sullivan <bryano at fb.com>
# Date 1336813916 -7200
# Node ID 20b9034aad306492348666a2a1abb6ead548458d
# Parent  1388cc711ea70387ec648ded919e854c94e36c04
tests: make test-convert-darcs.t happier with darcs 2.8.0

diff -r 1388cc711ea7 -r 20b9034aad30 tests/test-convert-darcs.t
--- a/tests/test-convert-darcs.t	Tue May 08 15:31:00 2012 -0700
+++ b/tests/test-convert-darcs.t	Sat May 12 11:11:56 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(.~0~)
   We have conflicts in the following files:
   ./a
-  Finished pulling and applying.
   $ sleep 1
   $ echo e > a
   $ echo f > f


More information about the Mercurial-devel mailing list