Hi there, this is probably offtopic but I need some help with applying a patch for boost::gil. First of all, I don't have much experience with patch and I need to change that. I read some tutorials online on how to patch with subversion and it seems pretty straightforward. I did some little testing myself and everything works as expected. Nice tool, I like it! Now, my first real life try with patch and I'm running into a problem immediately. I get this error with subversion: --------------------------- TortoiseMerge --------------------------- The patch seems outdated! The file line TIFF *_tp; and the patchline TIFF *_tp; do not match! --------------------------- OK --------------------------- The patch file was send to boost mailing list and maybe some lines got shifted by a whitespace but I cannot really tell. I uploaded that patch file here: http://code.google.com/p/gil-contributions/source/browse/trunk/gil_fix/tiff_... Could someone tell me what's wrong with that patch file and how to fix it? Thanks, Christian
AMDG Christian Henning wrote:
Now, my first real life try with patch and I'm running into a problem immediately. I get this error with subversion:
--------------------------- TortoiseMerge --------------------------- The patch seems outdated! The file line TIFF *_tp; and the patchline TIFF *_tp; do not match! --------------------------- OK ---------------------------
The patch file was send to boost mailing list and maybe some lines got shifted by a whitespace but I cannot really tell.
That seems to be the case, since it applies cleanly with patch -l
I uploaded that patch file here:
http://code.google.com/p/gil-contributions/source/browse/trunk/gil_fix/tiff_...
Could someone tell me what's wrong with that patch file and how to fix it?
I've attached a corrected patch. In Christ, Steven Watanabe
Thanks Steven, I copied your patch file in my main boost folder along with patch.exe. Now patch cannot find the tiff_io.hpp or it doesn't understand the first line. What is your command line? Thanks, Christian On Sat, Jul 17, 2010 at 3:53 PM, Steven Watanabe <watanabesj@gmail.com> wrote:
AMDG
Christian Henning wrote:
Now, my first real life try with patch and I'm running into a problem immediately. I get this error with subversion:
--------------------------- TortoiseMerge --------------------------- The patch seems outdated! The file line TIFF *_tp; and the patchline TIFF *_tp; do not match! --------------------------- OK ---------------------------
The patch file was send to boost mailing list and maybe some lines got shifted by a whitespace but I cannot really tell.
That seems to be the case, since it applies cleanly with patch -l
I uploaded that patch file here:
http://code.google.com/p/gil-contributions/source/browse/trunk/gil_fix/tiff_...
Could someone tell me what's wrong with that patch file and how to fix it?
I've attached a corrected patch.
In Christ, Steven Watanabe
_______________________________________________ Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
AMDG Christian Henning wrote:
Thanks Steven, I copied your patch file in my main boost folder along with patch.exe. Now patch cannot find the tiff_io.hpp or it doesn't understand the first line. What is your command line?
patch -p0 <tiff_io.hpp.patch with the original patch I used patch --verbose -l -p0 < tiff_io.patch In Christ, Steven Watanabe
Thanks Steven, your second command line worked for me. Christian On Sat, Jul 17, 2010 at 5:16 PM, Steven Watanabe <watanabesj@gmail.com> wrote:
AMDG
Christian Henning wrote:
Thanks Steven, I copied your patch file in my main boost folder along with patch.exe. Now patch cannot find the tiff_io.hpp or it doesn't understand the first line. What is your command line?
patch -p0 <tiff_io.hpp.patch
with the original patch I used patch --verbose -l -p0 < tiff_io.patch
In Christ, Steven Watanabe
_______________________________________________ Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
participants (2)
-
Christian Henning -
Steven Watanabe