[PATCH] tests: make test-convert-darcs.t happier with darcs 2.8.0
Bryan O'Sullivan
bos at serpentine.com
Sun May 13 04:47:59 CDT 2012
# HG changeset patch
# User Bryan O'Sullivan <bryano at fb.com>
# Date 1336902475 -7200
# Node ID ec12c2118c7b3570ba23174610f4223c75f631f1
# Parent 6921fade1dc1742daae18e6a5aeacb4c61bd9bb7
tests: make test-convert-darcs.t happier with darcs 2.8.0
diff -r 6921fade1dc1 -r ec12c2118c7b tests/test-convert-darcs.t
--- a/tests/test-convert-darcs.t Sun May 13 11:41:25 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
More information about the Mercurial-devel
mailing list