Mercurial > public > mercurial-scm > hg-stable

diff tests/test-convert-cvsnt-mergepoints.t @ 16972:5efe9c6a34fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add some missing #if's / hghave requirements Seen on Linux with FAT.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 15 Jun 2012 00:02:27 +0200
parents f2719b387380
children 4f8054d3171b
line wrap: on
line diff
--- a/tests/test-convert-cvsnt-mergepoints.t	Fri Jun 15 00:02:27 2012 +0200
+++ b/tests/test-convert-cvsnt-mergepoints.t	Fri Jun 15 00:02:27 2012 +0200
@@ -91,6 +91,8 @@
   $ echo xyzzy > foo.txt
   $ cvsci -m "merge1+clobber" foo.txt
 
+#if unix-permissions
+
 return to trunk and merge MYBRANCH1_2
 
   $ cvscall -Q update -P -A
@@ -200,5 +202,6 @@
   Members: 
   	foo.txt:1.1.4.1->1.1.4.2 
   
+#endif
 
   $ cd ..