-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08.08.2014 20:36, Jared Bownds wrote: > For example, would these be an expected output? > > (jared)-(11:33:30)-(/usr/lib/python2.6/site-packages/Trac-1.0-py2.6.egg/trac) > > -> *patch -p1 < Trac-show_full_names-sorted-r4-0.12.2.patch*
Yes. As you see at least some changes apply. Otherwise it could be just on the wrong level, but obviously you adjusted it correctly with -p option. Offset is a hint on code changes between the version the patch has been created an the version you're trying to apply the patch. With only offset it might, but is not guaranteed to work. Anyway the presented case includes failing lines too, so you're required to rework the changes collected in the corresponding *.rej files to fit into the current version. Depending on the intermediately introduced changes adjusting a patch is anything between trivial and almost impossible. Recent commit messages could help to reveal potentially complicated changes. No one could tell without seeing the code in detail. And certainly it is no longer "just patching" but will require some Python knowledge to do the work. Steffen Hoffmann -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iEYEARECAAYFAlPmHpgACgkQ31DJeiZFuHcB/QCeITZc6kpdzv6+SfVkhR3P8Poe yFoAoKP+raVrTZPdotcXzuUMkyHSyHPe =0vbt -----END PGP SIGNATURE----- -- You received this message because you are subscribed to the Google Groups "Trac Users" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/trac-users. For more options, visit https://groups.google.com/d/optout.
