#
#
# delete "tests/t_ls_unknown.at"
#
# patch "ChangeLog"
#  from [0c578955f63ad6cb465788a62afd792c3ffce8b3]
#    to [f4ae4111f44e98d4c1be5cac725590217e557023]
#
# patch "tests/t_automate_inventory.at"
#  from [fb2dd05a38058f8b3d96459883d6d77077c09146]
#    to [1a9fcca95a722a81cf5fe49a6dd7025900c4e311]
#
# patch "tests/t_cvsimport.at"
#  from [d90be7362d26765d89f6fc6a3fed42cd2df05f10]
#    to [72f1079d6cb4ac5810d17e8ecf709e97cec1460b]
#
# patch "testsuite.at"
#  from [1353463027f71082bc339aaafab7d55b0ccbde27]
#    to [ba943ffe903445a96c42d9196cc9d167b5f7858f]
#
============================================================
--- ChangeLog	0c578955f63ad6cb465788a62afd792c3ffce8b3
+++ ChangeLog	f4ae4111f44e98d4c1be5cac725590217e557023
@@ -1,14 +1,3 @@
-2006-03-02  Emile Snyder  <address@hidden>
-
-	XFAIL tests on non-win32 systems where we innappropriately I()
-	that some path does not have a '\' character in it.
-	
-	tests/t_cvsimport.at: CVS repository files can trigger this bug.
-	tests/t_automate_inventory.at
-	tests/t_ls_unknown.at: Files in the workspace can trigger this bug in
-	these two cases.
-	testsuite.at: Add new ls_unknown test case.
-	
 2006-03-01  Benoît Dejean  <address@hidden>

 	* po/fr.po: Updated French translation.
============================================================
--- tests/t_automate_inventory.at	fb2dd05a38058f8b3d96459883d6d77077c09146
+++ tests/t_automate_inventory.at	1a9fcca95a722a81cf5fe49a6dd7025900c4e311
@@ -1,10 +1,6 @@
 AT_SETUP([workspace inventory])
 MONOTONE_SETUP

-# Buggy invariant causes failure when file with back slash in name exists
-# in workspace.
-AT_XFAIL_IF(test "$OSTYPE" != "msys")
-
 AT_DATA(inventory_hooks.lua, [

 function ignore_file(name)
@@ -33,10 +29,6 @@
 ])
 AT_DATA(unknown, [unknown
 ])
-if test "$OSTYPE" != "msys"; then
-AT_DATA(back\\slash, [unknown back slash file name
-])
-fi
 AT_DATA(ignored~, [ignored~
 ])

@@ -59,9 +51,6 @@
 AT_CHECK(grep '^  P 0 0 patched$' stdout, [], [ignore], [ignore])
 AT_CHECK(grep '^    0 0 unchanged$' stdout, [], [ignore], [ignore])
 AT_CHECK(grep '^  U 0 0 unknown$' stdout, [], [ignore], [ignore])
-if test "$OSTYPE" != "msys"; then
-AT_CHECK(grep '^  U 0 0 back\\slash$' stdout, [], [ignore], [ignore])
-fi
 AT_CHECK(grep '^  I 0 0 ignored~$' stdout, [], [ignore], [ignore])

 # swapped but not moved
============================================================
--- tests/t_cvsimport.at	d90be7362d26765d89f6fc6a3fed42cd2df05f10
+++ tests/t_cvsimport.at	72f1079d6cb4ac5810d17e8ecf709e97cec1460b
@@ -1,12 +1,9 @@
 #  -*- Autoconf -*-

 AT_SETUP([importing CVS files])

 MONOTONE_SETUP

-# File names with backslashes in them are legal in cvs, but not in monotone.
-AT_XFAIL_IF(test "$OSTYPE" != "msys")
-
 AT_DATA(importme.0, [version 0 of test file
 ])

@@ -19,11 +16,6 @@
 AT_DATA(importme.3, [version 3 of test file
 ])

-if test "$OSTYPE" != "msys"; then
-AT_DATA(importback\\slash, [file with a back slash in the name
-])
-fi
-
 TSHA0=`SHA1(importme.0)`
 TSHA1=`SHA1(importme.1)`
 TSHA2=`SHA1(importme.2)`
@@ -52,14 +44,6 @@
 AT_CHECK(cp importme.3 testdir/importme)
 AT_CHECK(cvs -d $CVSROOT commit -m 'commit 3' testdir/importme, [], [ignore], [ignore])

-# file names with backslashes in them are legal in cvs, but not in monotone.
-
-if test "$OSTYPE" != "msys"; then
-AT_CHECK(cp importback\\slash testdir/importback\\slash)
-AT_CHECK(cvs -d $CVSROOT add testdir/importback\\slash, [], [ignore], [ignore])
-AT_CHECK(cvs -d $CVSROOT commit -m 'commit 4' testdir/importback\\slash, [], [ignore], [ignore])
-fi
-
 # import into monotone and check presence of files

 # safety check -- we stop people from accidentally feeding their whole
============================================================
--- testsuite.at	1353463027f71082bc339aaafab7d55b0ccbde27
+++ testsuite.at	ba943ffe903445a96c42d9196cc9d167b5f7858f
@@ -787,4 +787,3 @@
 m4_include(tests/t_log_dir.at)
 m4_include(tests/t_show_conflicts.at)
 m4_include(tests/t_merge_into_dir.at)
-m4_include(tests/t_ls_unknown.at)