-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 29/03/12 14:51, Alon Bar-Lev wrote: > This is not good. Another issue of this MIME magic that should be > avoided. VC files are CRLF, if we do not commit them this way, > every time they change we see a complete rewrite. > > If you do not want to pull, please do: > > find . -name '*.sln' -or -name '*.vcxproj.*' | xargs unix2dos > > And commit.
We had quite some clean-up rounds on CR/LF issues quite a while ago. After a lot of testing and searching the net, we found out that keeping the git tree NL only would be an advantage. And CR/LF issues would be avoided when setting 'git config --global core.autocrlf true' on Windows boxes. This makes git add CR/LF when checking out files from the repo automatically, and it will be stripped out when committing files. It's also described here: <https://community.openvpn.net/openvpn/wiki/GitCrashCourse#Otherneatfeaturestoenable> Can you please double check if this works for you? Then we don't have to bother with the CR/LF issues at all, as it's mostly automatic. kind regards, David Sommerseth > On Thu, Mar 29, 2012 at 12:46 PM, David Sommerseth > <openvpn.l...@topphemmelig.net> wrote: On 24/03/12 08:58, Alon > Bar-Lev wrote: >>>> Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com> --- >>>> .gitignore | 2 + build/msvc/msvc-generate/Makefile.am >>>> | 2 +- build/msvc/msvc-generate/msvc-generate.vcproj | >>>> 74 --- build/msvc/msvc-generate/msvc-generate.vcxproj | 69 >>>> +++ msvc-build.bat | 27 +- >>>> msvc-dev.bat | 19 +- msvc-env.bat >>>> | 7 +- openvpn.sln | >>>> 90 ++-- src/compat/Makefile.am | 3 >>>> +- src/compat/compat.vcproj | 197 >>>> ------ src/compat/compat.vcxproj | 87 >>>> +++ src/compat/compat.vcxproj.filters | 42 ++ >>>> src/openvpn/Makefile.am | 3 +- >>>> src/openvpn/openvpn.vcproj | 777 >>>> ------------------------ src/openvpn/openvpn.vcxproj | 261 >>>> ++++++++ src/openvpn/openvpn.vcxproj.filters | >>>> 458 ++++++++++++++ src/openvpnserv/Makefile.am >>>> | 3 +- src/openvpnserv/openvpnserv.vcproj | >>>> 209 ------- src/openvpnserv/openvpnserv.vcxproj | >>>> 112 ++++ src/openvpnserv/openvpnserv.vcxproj.filters | >>>> 35 ++ 20 files changed, 1153 insertions(+), 1324 deletions(-) >>>> delete mode 100644 >>>> build/msvc/msvc-generate/msvc-generate.vcproj create mode >>>> 100644 build/msvc/msvc-generate/msvc-generate.vcxproj delete >>>> mode 100644 src/compat/compat.vcproj create mode 100644 >>>> src/compat/compat.vcxproj create mode 100644 >>>> src/compat/compat.vcxproj.filters delete mode 100644 >>>> src/openvpn/openvpn.vcproj create mode 100644 >>>> src/openvpn/openvpn.vcxproj create mode 100644 >>>> src/openvpn/openvpn.vcxproj.filters delete mode 100644 >>>> src/openvpnserv/openvpnserv.vcproj create mode 100644 >>>> src/openvpnserv/openvpnserv.vcxproj create mode 100644 >>>> src/openvpnserv/openvpnserv.vcxproj.filters > > Applied to master branches on -testing and -stable trees. > > > commit 3c1971de878bb3658c38b0504f314d38b6b765d2 Author: Alon > Bar-Lev <alon.bar...@gmail.com> Date: Sat Mar 24 09:58:36 2012 > +0200 > > Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com> Acked-by: > Samuli Seppänen <sam...@openvpn.net> Signed-off-by: David > Sommerseth <dav...@redhat.com> > > > kind regards, > > David Sommerseth >> >> ------------------------------------------------------------------------------ >> >> This SF email is sponsosred by: >> Try Windows Azure free for 90 days Click Here >> http://p.sf.net/sfu/sfd2d-msazure >> _______________________________________________ Openvpn-devel >> mailing list Openvpn-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/openvpn-devel > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk90XOQACgkQDC186MBRfrriugCaA58VFgV1k15ebL/h0Uk4FExx u4MAnRL5oNuoLPym6qH3Jc/Rzf28ZcJP =O/kG -----END PGP SIGNATURE-----
