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

Matt Mackall mpm at selenic.com
Sun May 13 04:29:11 CDT 2012


On Sat, 2012-05-12 at 11:13 +0200, Bryan O'Sullivan wrote:
> # 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

This fails with:

@@ -49,7 +49,7 @@
   Finished recording patch 'p1.2'
 
   $ darcs pull -q -a --no-set-default ../darcs-clone
-  Backing up ./a(.~0~)
+  Backing up ./a(-darcs-backup0)
   We have conflicts in the following files:
   ./a
   $ sleep 1

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list