From patchwork Tue Jan 14 22:22:05 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D7816: tests: stabilize test-subrepo-svn.t on Windows
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 44343
Message-Id: <896a4f9fdccae03b906b113c1c9ad809@localhost.localdomain>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Tue, 14 Jan 2020 22:22:05 +0000

mharbison72 edited the summary of this revision.
mharbison72 updated this revision to Diff 19269.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7816?vs=19265&id=19269

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7816/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7816

AFFECTED FILES
  tests/test-subrepo-svn.t

CHANGE DETAILS




To: mharbison72, #hg-reviewers, pulkit
Cc: mercurial-devel

diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t
--- a/tests/test-subrepo-svn.t
+++ b/tests/test-subrepo-svn.t
@@ -87,10 +87,12 @@
 
   $ hg debugsub
   path s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 2
   path subdir/s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 2
 
 change file in svn and hg, commit
@@ -113,10 +115,12 @@
   At revision 3.
   $ hg debugsub
   path s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 3
   path subdir/s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 2
 
 missing svn file, commit should fail
@@ -235,10 +239,12 @@
 
   $ hg debugsub
   path s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 3
   path subdir/s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 2
 
 verify subrepo is contained within the repo directory
@@ -574,8 +580,8 @@
 Test forgetting files, not implemented in svn subrepo, used to
 traceback
 
-  $ hg forget 'notafile*'
-  notafile*: $ENOENT$
+  $ hg forget 'notafile'
+  notafile: $ENOENT$
   [1]
 
 Test a subrepo referencing a just moved svn path. Last commit rev will