Subject: Re: [boost] [conversion] Isolating the phantom file changes problem
From: Jürgen Hunold (jhunold_at_[hidden])
Date: 2013-11-26 01:54:49
Hi Beman,
On Monday, 25. November 2013 15:26:56 Beman Dawes wrote:
> This is the simplest case I could come up with where git clone produced a
> initially modified state.
>
> Any ideas why this is happening? Is this another manifestation of crlf
> problems?
Yes, definetely.
> D:\modular-boost\libs\pool>git status
> # Not currently on any branch.
> # Changes not staged for commit:
> # (use "git add <file>..." to update what will be committed)
> # (use "git checkout -- <file>..." to discard changes in working
> directory)
> #
> # modified: doc/images/mb1.svg
Those are missing svn:eol-style:
boost.svn$ svn proplist libs/pool/doc/images/mb1.svg
Properties on 'libs/pool/doc/images/mb1.svg':
svn:mime-type
boost.svn$ svn propget svn:mime-type libs/pool/doc/images/mb1.svg
image/svg+xml
And image/* marks this as "binary". We had this discussion weeks ago with
noch real decision.
> D:\modular-boost\libs\interprocess>git status
> # modified: proj/vc7ide/managed_shared_memory.vcproj
> # modified: proj/vc7ide/offset_ptr_test.vcproj
boost.svn$ svn proplist
libs/interprocess/proj/vc7ide/managed_shared_memory.vcproj
Properties on 'libs/interprocess/proj/vc7ide/managed_shared_memory.vcproj':
svn:eol-style
svn:mime-type
boost.svn$ svn propget svn:eol-style
libs/interprocess/proj/vc7ide/managed_shared_memory.vcproj
CRLF
boost.svn$ svn propget svn:mime-type
libs/interprocess/proj/vc7ide/managed_shared_memory.vcproj
text/xml
Explicit CRLF.
> D:\modular-boost\libs\intrusive>git status
> # modified: proj/vc7ide/avl_multiset/avl_multiset.vcproj
> # modified: proj/vc7ide/avl_set/avl_set.vcproj
> # modified: proj/vc7ide/sg_multiset/sg_multiset.vcproj
> # modified: proj/vc7ide/sg_set/sg_set.vcproj
> # modified: proj/vc7ide/splay_multiset/splay_multiset.vcproj
> # modified: proj/vc7ide/splay_set/splay_set.vcproj
Dito.
The final question is how to resolve this. I am not sure which solution is
best. I'd like to set all text-based files (including .svg and .bat) to
svn:eol-style native and svn:mime-type text/* in svn and then re-run the
conversion again. The main reason is that this worked really well for the rest
of the repository.
Just my .02€
Yours,
Jürgen
-- * Dipl.-Math. Jürgen Hunold ! * voice: ++49 4257 300 ! Fährstraße 1 * fax : ++49 4257 300 ! 31609 Balge/Sebbenhausen * jhunold_at_gmx.eu ! Germany