|File Search||Catalog||Content Search|
Wiggle will always apply all changes in the patch to the original. If it cannot find a way to cleanly apply a patch, it inserts it in the original in a manner similar to 'merge', and reports an unresolvable conflict.
.\" -*- nroff -*- .\" wiggle - apply rejected patches .\" .\" Copyright (C) 2003 Neil Brown <firstname.lastname@example.org> .\" Copyright (C) 2010 Neil Brown <email@example.com> .\" .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by .\" the Free Software Foundation; either version 2 of the License, or . more»
- extract.c should be able to extract half of a word-diff - extract.c should work on word-merges - review all test output to make sure it looks right - document 'p' DOING - can find_best be optimised more? - --verbose flag ?? what should it do? - review commented code and discard some of it - test on raid code - possibly encourage "###...####" onto line by itself in diff output - possibly remembe more»
GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away yo more»