On Wed, 8 May 2002, Jakob Eriksson wrote: [...]
Index: dlls/kernel/tests/directory.c
RCS file: /home/wine/wine/dlls/kernel/tests/directory.c,v retrieving revision 1.2 diff -u -r1.2 directory.c --- dlls/kernel/tests/directory.c 1 Apr 2002 21:00:26 -0000 1.2 +++ dlls/kernel/tests/directory.c 7 May 2002 23:28:33 -0000 @@ -126,3 +126,4 @@ test_GetSystemDirectoryA(); test_GetSystemDirectoryW(); }
Maybe not really necessary :-)
Index: dlls/kernel/tests/file.c
RCS file: /home/wine/wine/dlls/kernel/tests/file.c,v retrieving revision 1.2 diff -u -r1.2 file.c --- dlls/kernel/tests/file.c 6 May 2002 20:12:55 -0000 1.2 +++ dlls/kernel/tests/file.c 7 May 2002 23:28:33 -0000
[...]
@@ -170,6 +185,261 @@
ok( HFILE_ERROR == _lclose(filehandle), "_lclose should whine about this." );+<<<<<<< file.c
- ok( DeleteFileA( filename ) != 0, "DeleteFileA complains." );
+}
Wow! You have conflicts in your patch! You should resolve those and resubmit.
Or maybe this was the wrong diff?
-- Francois Gouget fgouget@free.fr http://fgouget.free.fr/ Advice is what we ask for when we already know the answer but wish we didn't -- Eric Jong