Follow-up Comment #12, task #6847 (project relax): This file is essentially patch_II (file #7620) with the following changes removed: - The '/' to os.sep fix (applied in commit r10206, https://mail.gna.org/public/relax-commits/2010-01/msg00108.html) - The [Tt][12x] to [Rr][12x] change (applied in commit r10207, https://mail.gna.org/public/relax-commits/2010-01/msg00109.html). Note that these two commits included more changes than just those in patch_II. Therefore the branch was reverted to r10205 by typing: $ svn up -r10205 Then the patch applied cleanly by: $ patch -p0 < patch_II Then the branch updated: $ svn up And finally all the conflicts resolved. This procedure can be used for separating out other components of patch_III. (file #7673) _______________________________________________________ Additional Item Attachment: File name: patch_III Size:400 KB _______________________________________________________ Reply to this item at: <http://gna.org/task/?6847> _______________________________________________ Message sent via/by Gna! http://gna.org/