On Sun, Aug 14, 2022 at 11:57 AM Vincent Lefevre <vincent-...@vinc17.net> wrote:
> > [1] Those files are:
> > build/generator/templates/svn_config.vcxproj.ezt
> > build/generator/templates/svn_locale.vcxproj.ezt
> > build/generator/templates/vcnet_vcxproj_filters.ezt
> > subversion/libsvn_subr/win32_crashrpt_dll.h
>
> Are you sure? I cannot see any such change in my patch.
> Couldn't this be the result of the revert of the licence
> headers?


This is weird.

Looking inside your original patch, in fact the patch does not change
those last lines.

But applying your original patch to a clean working copy and then
running 'svn diff' does show it -- note the - and + of </Project> and
"\ No newline at end of file" at the end of the output:

[[[

$ svn patch --quiet subversion-url.patch
$ svn diff build/generator/templates/svn_config.vcxproj.ezt
Index: build/generator/templates/svn_config.vcxproj.ezt
===================================================================
--- build/generator/templates/svn_config.vcxproj.ezt (revision 1903314)
+++ build/generator/templates/svn_config.vcxproj.ezt (working copy)
@@ -8,7 +8,7 @@
      "License"); you may not use this file except in compliance
      with the License.  You may obtain a copy of the License at

-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0

      Unless required by applicable law or agreed to in writing,
      software distributed under the License is distributed on an
@@ -78,4 +78,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

]]]

That looks like a bug in SVN. This machine (the one I'm using now) has
1.13.0 so I'll try this with 1.14.2 later...

Cheers,
Nathan

Reply via email to