"The Patch Seems Outdated! The File Line...And The Pathcline Do Not Match" - But they do!
BenTaylor
I have looked in the archives but have not been able to find an answer
to my issue. I have created several patches for an open source
project called dasblog. However, when I try to test apply the patches
on a clean source tree I get the error message:
"The patch seems outdated! The file line <snipped> and the patchline
<snipped> do not match!"
In reality the two <snipped> tags contain the contents of the line,
but both are exactly the same, and appear exactly the same when I view
them both in Notepad2 (with CR LF and whitespace showing).
Can anyone tell me how to solve this issue? Am I doing something
wrong?
If it helps, I have written the issue in full with screenshots on my
blog here:
http://bentaylor.org/The-Patch-Seems-Outdated-The-File-LineAnd-The-Patchline-Do-Not-Match.aspx
TIA,
Ben
---------------------------------------------------------------------
To unsubscribe, e-mail: users-un...@tortoisesvn.tigris.org
For additional commands, e-mail: users...@tortoisesvn.tigris.org
Stefan Küng
> Hi All,
>
> I have looked in the archives but have not been able to find an answer
> to my issue. I have created several patches for an open source
> project called dasblog. However, when I try to test apply the patches
> on a clean source tree I get the error message:
>
> "The patch seems outdated! The file line <snipped> and the patchline
> <snipped> do not match!"
>
> In reality the two <snipped> tags contain the contents of the line,
> but both are exactly the same, and appear exactly the same when I view
> them both in Notepad2 (with CR LF and whitespace showing).
>
> Can anyone tell me how to solve this issue? Am I doing something
> wrong?
>
> If it helps, I have written the issue in full with screenshots on my
> blog here:
>
> http://bentaylor.org/The-Patch-Seems-Outdated-The-File-LineAnd-The-Patchline-Do-Not-Match.aspx
Which version of TSVN/TortoiseMerge are you using? This should have been
fixed a long time ago: the reason the patch doesn't work is because of
the unicode markers at the beginning of the file.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
BenTaylor
I was not on the latest version <sound of wrist slapping>, but I have
just upgraded and re-created the patch. Unfortunately, I still get
exactly the same problem when I try and apply the patch.
When I posted this I was using 1.5.2, Build 13595 - 64 Bit, 2008/07/31
17:04:57. I have now upgraded to 1.5.3, Build 13783 - 64 Bit.
However, the problem is still the same (I did reboot and confirm that
TortoiseSVN had changed version number).
Is the bug in anyway related to checkout, or is isolated to the patch
functionality? I ask, because I have not tried checking out a fresh
source tree, re-doing the work, and THEN re-creating the patch.
Thank you for responding so quickly. It is much appreciated (I am off
to your donation page right now!).
Ben
On Aug 31, 4:02 pm, Stefan Küng <tortoise...@gmail.com> wrote:
> BenTaylor wrote:
> > Hi All,
>
> > I have looked in the archives but have not been able to find an answer
> > to my issue. I have created several patches for an open source
> > project called dasblog. However, when I try to test apply the patches
> > on a clean source tree I get the error message:
>
> > "The patch seems outdated! The file line <snipped> and the patchline
> > <snipped> do not match!"
>
> > In reality the two <snipped> tags contain the contents of the line,
> > but both are exactly the same, and appear exactly the same when I view
> > them both in Notepad2 (with CR LF and whitespace showing).
>
> > Can anyone tell me how to solve this issue? Am I doing something
> > wrong?
>
> > If it helps, I have written the issue in full with screenshots on my
> > blog here:
>
> >http://bentaylor.org/The-Patch-Seems-Outdated-The-File-LineAnd-The-Pa...
>
> Which version of TSVN/TortoiseMerge are you using? This should have been
> fixed a long time ago: the reason the patch doesn't work is because of
> the unicode markers at the beginning of the file.
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
> signature.asc
> < 1KViewDownload
Stefan Küng
> Hi Stefan,
>
> I was not on the latest version <sound of wrist slapping>, but I have
> just upgraded and re-created the patch. Unfortunately, I still get
> exactly the same problem when I try and apply the patch.
>
> When I posted this I was using 1.5.2, Build 13595 - 64 Bit, 2008/07/31
> 17:04:57. I have now upgraded to 1.5.3, Build 13783 - 64 Bit.
> However, the problem is still the same (I did reboot and confirm that
> TortoiseSVN had changed version number).
Can you try applying the patch with the 32-bit version? You don't have
to install TSVN-32bit for that: just use the standalone version:
http://sourceforge.net/project/showfiles.php?group_id=138498&package_id=281312
(download tortoisediff.zip - it contains TortoiseMerge and TortoiseIDiff).
I'm not sure whether that will help, but it will help me to find the
problem.
> Is the bug in anyway related to checkout, or is isolated to the patch
> functionality? I ask, because I have not tried checking out a fresh
> source tree, re-doing the work, and THEN re-creating the patch.
That's only for applying patches. You won't have any problems when doing
checkouts or any other Subversion command.
> Thank you for responding so quickly. It is much appreciated (I am off
> to your donation page right now!).
Thanks a lot for your donation!
BenTaylor
I downloaded the zip, extracted it, and ran TortoiseMerge. I then
selected "Apply Unified Diff" and located the diff/patch file and the
directory of the clean source tree. Now, when I try and preview the
patched file, I get a different error message, which is "The system
cannot find the file specified."
Should I try uninstalling the 64 bit version and installing the 32 bit
version just to make sure?
Also, I just thought of some other (maybe) relevant information. The
"subversion" I am connecting to is on CodePlex. It is not a *real*
Subversion, it is an implementation on top of TFS (I believe). Is it
possible that this could be their bug?
Donation was my pleasure. You are doing a great job and you make my
job easier.
Ben
On Sep 1, 11:19 am, Stefan Küng <tortoise...@gmail.com> wrote:
> BenTaylor wrote:
> > Hi Stefan,
>
> > I was not on the latest version <sound of wrist slapping>, but I have
> > just upgraded and re-created the patch. Unfortunately, I still get
> > exactly the same problem when I try and apply the patch.
>
> > When I posted this I was using 1.5.2, Build 13595 - 64 Bit, 2008/07/31
> > 17:04:57. I have now upgraded to 1.5.3, Build 13783 - 64 Bit.
> > However, the problem is still the same (I did reboot and confirm that
> > TortoiseSVN had changed version number).
>
> Can you try applying the patch with the 32-bit version? You don't have
> to install TSVN-32bit for that: just use the standalone version:http://sourceforge.net/project/showfiles.php?group_id=138498&package_...
> (download tortoisediff.zip - it contains TortoiseMerge and TortoiseIDiff).
>
> I'm not sure whether that will help, but it will help me to find the
> problem.
>
> > Is the bug in anyway related to checkout, or is isolated to the patch
> > functionality? I ask, because I have not tried checking out a fresh
> > source tree, re-doing the work, and THEN re-creating the patch.
>
> That's only for applying patches. You won't have any problems when doing
> checkouts or any other Subversion command.
>
> > Thank you for responding so quickly. It is much appreciated (I am off
> > to your donation page right now!).
>
> Thanks a lot for your donation!
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
BenTaylor
I downloaded the zip, extracted it, and ran TortoiseMerge. I then
selected "Apply Unified Diff" and located the diff/patch file and the
directory of the clean source tree. Now, when I try and preview the
patched file, I get a different error message, which is "The system
cannot find the file specified."
Should I try uninstalling the 64 bit version and installing the 32 bit
version just to make sure?
Also, I just thought of some other (maybe) relevant information. The
"subversion" I am connecting to is on CodePlex. It is not a *real*
Subversion, it is an implementation on top of TFS (I believe). Is it
possible that this could be their bug?
Donation was my pleasure. You are doing a great job and you make my
job easier.
Ben
On Sep 1, 11:19 am, Stefan Küng <tortoise...@gmail.com> wrote:
> BenTaylor wrote:
> > Hi Stefan,
>
> > I was not on the latest version <sound of wrist slapping>, but I have
> > just upgraded and re-created the patch. Unfortunately, I still get
> > exactly the same problem when I try and apply the patch.
>
> > When I posted this I was using 1.5.2, Build 13595 - 64 Bit, 2008/07/31
> > 17:04:57. I have now upgraded to 1.5.3, Build 13783 - 64 Bit.
> > However, the problem is still the same (I did reboot and confirm that
> > TortoiseSVN had changed version number).
>
> Can you try applying the patch with the 32-bit version? You don't have
> to install TSVN-32bit for that: just use the standalone version:http://sourceforge.net/project/showfiles.php?group_id=138498&package_...
> (download tortoisediff.zip - it contains TortoiseMerge and TortoiseIDiff).
>
> I'm not sure whether that will help, but it will help me to find the
> problem.
>
> > Is the bug in anyway related to checkout, or is isolated to the patch
> > functionality? I ask, because I have not tried checking out a fresh
> > source tree, re-doing the work, and THEN re-creating the patch.
>
> That's only for applying patches. You won't have any problems when doing
> checkouts or any other Subversion command.
>
> > Thank you for responding so quickly. It is much appreciated (I am off
> > to your donation page right now!).
>
> Thanks a lot for your donation!
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
Stefan Küng
> Hi Stefan,
>
> selected "Apply Unified Diff" and located the diff/patch file and the
> directory of the clean source tree. Now, when I try and preview the
> patched file, I get a different error message, which is "The system
> cannot find the file specified."
That error message is expected, well, at least if the patch is outdated
(or appears to be for TortoiseMerge):
TortoiseMerge tries to find TortoiseProc to download the correct version
of the file to do a three-way merge. Only if that fails, you'll get the
"the patch seems outdated" error. But in your 32-bit case, it can't find
the 32-bit TortoisProc binary and that's the error you're seeing here.
Which means it's the same problem as before...
> Should I try uninstalling the 64 bit version and installing the 32 bit
> version just to make sure?
That won't help much.
> Also, I just thought of some other (maybe) relevant information. The
> "subversion" I am connecting to is on CodePlex. It is not a *real*
> Subversion, it is an implementation on top of TFS (I believe). Is it
> possible that this could be their bug?
Hmm - if it's on CodePlex it means it's free stuff:
please zip the patchfile and send it here, including the info about
which project you're trying to apply the patch to (url for checkout,
which revision is your working copy on).
That way I can reproduce the problem