svn commit: trunk/busybox/editors

vda at busybox.net vda at busybox.net
Sat Dec 16 16:49:56 PST 2006


Author: vda
Date: 2006-12-16 16:49:56 -0800 (Sat, 16 Dec 2006)
New Revision: 16979

Log:
diff: comment - explain what happens when hunk fails to apply


Modified:
   trunk/busybox/editors/patch.c


Changeset:
Modified: trunk/busybox/editors/patch.c
===================================================================
--- trunk/busybox/editors/patch.c	2006-12-17 00:33:29 UTC (rev 16978)
+++ trunk/busybox/editors/patch.c	2006-12-17 00:49:56 UTC (rev 16979)
@@ -15,9 +15,8 @@
  *
  *  Issues
  *   - Non-interactive
- *   - Patches must apply cleanly or the hunk will fail.
+ *   - Patches must apply cleanly or patch (not just one hunk) will fail.
  *   - Reject file isnt saved
- *   -
  */
 
 #include <getopt.h>
@@ -214,6 +213,8 @@
 							bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start);
 							hunk_error++;
 							free(patch_line);
+							/* Probably need to find next hunk, etc... */
+							/* but for now we just bail out */
 							patch_line = NULL;
 							break;
 						}



More information about the busybox-cvs mailing list