Il 14/01/2017 18:15, Stefan Sperling ha scritto: > On Sat, Jan 14, 2017 at 05:29:11PM +0100, Vincenzo Reale wrote: >> The attached patch should work with 1.9 branch. > > Unfortuntaly, it does not: > > $ svn info --show-item url > https://svn.apache.org/repos/asf/subversion/branches/1.9.x/subversion/po > $ svn patch /tmp/it_19.patch > C it.po >> rejected hunk @@ -10128,13 +10453,15 @@ > Summary of conflicts: > Text conflicts: 1 >
Hello Stefan, sorry for the late reply. I have a different result on my PC: [vinx@arch subversion]$ svn info --show-item url https://svn.apache.org/repos/asf/subversion/branches/1.9.x/subversion/po [vinx@arch subversion]$ svn patch /home/vinx/subversion/it_19.patch U it.po but I don't know why it fails on yours. Regards, Vincenzo
