Patchwork [4,of,4] test-fileset: forget non-portable files to avoid failures on Windows

login
register
mail settings
Submitter Matt Harbison
Date March 21, 2015, 6:11 a.m.
Message ID <07130589cddcc9d9a175.1426918264@Envy>
Download mbox | patch
Permalink /patch/8214/
State Accepted
Headers show

Comments

Matt Harbison - March 21, 2015, 6:11 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1426915457 14400
#      Sat Mar 21 01:24:17 2015 -0400
# Node ID 07130589cddcc9d9a175b9efbce40d4f38de4252
# Parent  75ed9687553578e1253baf6b357cbe90076969a7
test-fileset: forget non-portable files to avoid failures on Windows

The 3 deleted lines appeared on Windows, because the files were never created in
the first place.
Pierre-Yves David - March 22, 2015, 1:01 a.m.
On 03/20/2015 11:11 PM, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1426915457 14400
> #      Sat Mar 21 01:24:17 2015 -0400
> # Node ID 07130589cddcc9d9a175b9efbce40d4f38de4252
> # Parent  75ed9687553578e1253baf6b357cbe90076969a7
> test-fileset: forget non-portable files to avoid failures on Windows

patch 1, 2 and 4 have been pushed to the clowncopter. Thanks

Patch

diff --git a/tests/test-fileset.t b/tests/test-fileset.t
--- a/tests/test-fileset.t
+++ b/tests/test-fileset.t
@@ -247,6 +247,9 @@ 
   bar 
   baz\
   con.xml
+  $ hg forget 'bar '
+  $ hg forget 'baz\'
+  $ hg forget 'con.xml'
 #endif
 
   $ fileset -r4 'subrepo("re:su.*")'
@@ -271,10 +274,7 @@ 
   a1
   b1
   b2
-  bar 
-  baz\
   c1
-  con.xml
   mixed
   $ fileset 'eol(mac)'
   mac