[PATCH] test-subrepo-git.t: adapt for Windows

alexandrul.ct at gmail.com alexandrul.ct at gmail.com
Tue Jun 19 15:33:24 CDT 2012


# HG changeset patch
# User Eduard-Cristian Stefan <alexandrul.ct at gmail.com>
# Date 1340137939 -10800
# Node ID a20a2088c90c3e3781d2c6415a23ff0b2c6f8203
# Parent  ee18cedec2c29a9aa2830c929225f83a6931f473
test-subrepo-git.t: adapt for Windows

diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -2,6 +2,8 @@
 
 make git commits repeatable
 
+  $ echo "[core]" >> $HOME/.gitconfig
+  $ echo "autocrlf = false" >> $HOME/.gitconfig
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test at example.org'; export GIT_AUTHOR_EMAIL
   $ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE
@@ -133,7 +135,7 @@
 user b push changes
 
   $ hg push 2>/dev/null
-  pushing to $TESTTMP/t
+  pushing to $TESTTMP/t (glob)
   pushing branch testing of subrepo s
   searching for changes
   adding changesets
@@ -145,7 +147,7 @@
 
   $ cd ../ta
   $ hg pull
-  pulling from $TESTTMP/t
+  pulling from $TESTTMP/t (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -173,7 +175,7 @@
    source   ../gitroot
    revision f47b465e1bce645dbf37232a00574aa1546ca8d3
   $ hg push 2>/dev/null
-  pushing to $TESTTMP/t
+  pushing to $TESTTMP/t (glob)
   pushing branch testing of subrepo s
   searching for changes
   adding changesets
@@ -205,7 +207,7 @@
   $ echo aa >> a
   $ hg commit -m aa
   $ hg push
-  pushing to $TESTTMP/t
+  pushing to $TESTTMP/t (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -292,7 +294,7 @@
   M inner/s/f
   $ hg commit --subrepos -m nested
   committing subrepository inner
-  committing subrepository inner/s
+  committing subrepository inner/s (glob)
 
 nested archive
 
@@ -509,8 +511,14 @@
 
 Test forgetting files, not implemented in git subrepo, used to
 traceback
-  $ hg forget 'notafile*'
-  notafile*: No such file or directory
+#if unix-permissions
+  $ hg forget 'notafile'
+  notafile: No such file or directory
   [1]
+#elsif
+  $ hg forget 'notafile'
+  notafile: The system cannot find the file specified
+  [1]
+#endif
 
   $ cd ..


More information about the Mercurial-devel mailing list