Skip to content

Instantly share code, notes, and snippets.

@anish
Created May 22, 2014 21:27
Show Gist options
  • Save anish/f4c90af416b17f5acba2 to your computer and use it in GitHub Desktop.
Save anish/f4c90af416b17f5acba2 to your computer and use it in GitHub Desktop.
git apply failure
anish@cerveza /home/workspace/archlinux/wine-silverlight/src/wine-1.7.19 $ grep wine_get_patches ../wine-compholio-daily-1.7.19/patches/patch-list.patch -B 5 | head -n 10
+++ b/dlls/ntdll/misc.c
@@ -60,6 +60,14 @@ const char * CDECL NTDLL_wine_get_version(void)
}
/*********************************************************************
+ * wine_get_patches (NTDLL.@)
+ */
+const void * CDECL NTDLL_wine_get_patches(void)
+{
+ return wine_get_patches();
anish@cerveza /home/workspace/archlinux/wine-silverlight/src/wine-1.7.19 $ for i in `seq 1 10`; do git apply ../wine-compholio-daily-1.7.19/patches/patch-list.patch; done
anish@cerveza /home/workspace/archlinux/wine-silverlight/src/wine-1.7.19 $ grep wine_get_patches dlls/ntdll/misc.c -c
0
anish@cerveza /home/workspace/archlinux/wine-silverlight/src/wine-1.7.19 $
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment