subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ryan Schmidt <subversion-2...@ryandesign.com>
Subject Re: EOL problems in cvs2svn converted repository
Date Mon, 12 Feb 2018 04:19:38 GMT

On Feb 11, 2018, at 10:49, Bo Berglund wrote:

> On Sun, 11 Feb 2018 08:45:17 +0000, Daniel Shahaf wrote:
> 
>> Bo Berglund wrote on Sun, 11 Feb 2018 09:34 +0100:
>>> For OpenVPN I found that I had to add some servers to apt-get in order
>>> to use the OpenVPN own repository, is there a similar solution for
>>> Subversion?
>> 
>> See https://subversion.apache.org/packages
>> 
>> ... but unless there is a specific bugfix from 1.9.4..1.9.7 that you
>> need, 1.9.3 should be fine.  See
>> https://svn.apache.org/repos/asf/subversion/trunk/CHANGES
>> (that file includes information for all past releases and some future ones)
> 
> Thanks,
> I went ahead and left the installed version at 1.9.3 on the Ubuntu
> 16.04 machine. Installed OpenVPN on this and could connect to the
> server LAN using my usual OVPN file.
> 
> With this I could check out a few small projects to test on and I
> found that the svn_apply_autoprops.py ran just fine on this.
> And if it can do what it is meant to do it seems like a good tool to
> use!
> 
> However I have now a few projects that have been modified and I wanted
> to check what came out, so inside the top folder of each modified
> project I ran svn diff <filename> to see what had happened and it
> turns out that it looks kind of strange to me....
> 
> For <filename>.txt:
> 
> svn diff Readme.txt
> Index: Readme.txt
> ===================================================================
> --- Readme.txt  (revision 16)
> +++ Readme.txt  (working copy)
> 
> Property changes on: Readme.txt
> ___________________________________________________________________
> Added: svn:keywords
> ## -0,0 +1 ##
> +Author Date Id Rev URL
> 
> 
> Here I cannot see that the native EOL I want added is applied...

I agree, the property was not set there by running svn_apply_autoprops.py. Maybe that's because
it was already set before? Run "svn proplist -v Readme.txt" to see the properties that are
currently set on the file.


> Instead some property "Keywords" which I lnow nothing about is being
> set.

Your autoprops settings (the default ones that you uncommented) instruct Subversion to set
those keywords to be expanded in text files. If you don't want to use keyword expansion, don't
instruct Subversion to do that (i.e. remove those entries from autoprops). Keyword substitution
is explained in the book:

http://svnbook.red-bean.com/en/1.7/svn.advanced.props.special.keywords.html


> For other Pascal files (*.pas, *.dpr etc):
> 
> svn diff BuildModel.pas
> Index: BuildModel.pas
> ===================================================================
> --- BuildModel.pas      (revision 16)
> +++ BuildModel.pas      (working copy)
> 
> Property changes on: BuildModel.pas
> ___________________________________________________________________
> Added: svn:eol-style
> ## -0,0 +1 ##
> +native
> \ No newline at end of property
> 
> 
> In this case I see +native, so I assume it means thet the eol-style is
> modified, but what does the last line mean?

It means that the svn:eol-style property's value does not end with a newline. In other words,
the property's value is the 6 characters "native", not the 6 characters "native" followed
by the newline character as you might otherwise assume had that message not been printed.
It is normal for property values not to end with a newline, so you will normally see this
message.



> I have modified the subversion conf file as follows:
> 
> [miscellany]
> global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a
>  *.pyc *.pyo *.a  *.aps  *.bak.clw  *.db  *.dbg  *.dcu
>  *.ddp  *.dsk  *.dti   *.err  *.exp  *.gid  *.gz *.bak
>  *.identcache  *.ilk  *.jar  *.lnk  *.local  *.log  *.lps
>  *.lrt *.mod  *.ncb  *.ocx  *.opt  *.pch
>  backup lib dcu
>  *.pjt *.plg  *.pdb  *.ppu  *.obj  *.hpp
>  *.or  *.rsj  *.rst  *.sbr  *.scc  *.sln  *.tar  *.tds
>  *.tlh *.tli  *.trg  *.vbw  *.zip  __history  bak  *.~*  .#*
> 
> use-commit-times = yes
> enable-auto-props = yes
> 
> [auto-props]
> *.c = svn:eol-style=native
> *.cpp = svn:eol-style=native
> *.h = svn:keywords=Author Date Id Rev URL;svn:eol-style=native
> *.dsp = svn:eol-style=CRLF
> *.dsw = svn:eol-style=CRLF
> *.sh = svn:eol-style=native;svn:executable
> *.txt = svn:eol-style=native;svn:keywords=Author Date Id Rev URL;
> *.png = svn:mime-type=image/png
> *.jpg = svn:mime-type=image/jpeg
> Makefile = svn:eol-style=native
> *.pas = svn:eol-style=native
> *.dpr = svn:eol-style=native
> *.dfm = svn:eol-style=native
> *.lpr = svn:eol-style=native
> *.lpi = svn:eol-style=native
> *.ini = svn:eol-style=native
> *.conf = svn:eol-style=native
> *.bat = svn:eol-style=native
> *.iss = svn:eol-style=native
> *.xml = svn:eol-style=native
> *.gld = svn:eol-style=native
> *.inc = svn:eol-style=native
> 
> Note that the auto-props settings from *.c until MakeFile are just
> using the standard settings that were present as defaults in the conf
> file but commented out. I uncommented these.
> The ones below Makefile I have added myself.
> 
> So the Readme.txt is affected by this line:
> *.txt = svn:eol-style=native;svn:keywords=Author Date Id Rev URL;
> 
> I have no idea what good the second setting on this line really does,
> maybe it should not be there at all???
> 
> Any advice?




Mime
View raw message