296
edits
Changes
→Properties
svn propset svn:eol-style native src/somefile.py
svn propset svn:keywords 'Id' src/somefile.py
====HOWTO setting the properties with git-svn ====
Unfortunately, as of git-svn 1.8.1.2, there is no such thing as "git svn propset" yet, only "git svn propget" and "git svn proplist".
To work this around, yet to avoid a full tree checkout, you can do a checkout of the subdirectory containing the new file(s) only
in a temporary location, if you only work with SVN to work around this git-svn limitation.
For example, when I added gramps/gui/utilscairo.py on the gramps40 branch:
cd gramps/gui/
git svn info | grep URL
This prints:
''URL: svn+ssh://svn.code.sf.net/p/gramps/code/branches/maintenance/gramps40/gramps/gui''
Now,
cd /tmp
svn checkout svn+ssh://svn.code.sf.net/p/gramps/code/branches/maintenance/gramps40/gramps/gui
cd gui
svn propset svn:mime-type text/plain utilscairo.py
svn propset svn:eol-style native utilscairo.py
svn propset svn:keywords 'Id' utilscairo.py
svn commit
==Removing files==
===Using svn merge===
The most common way to move changes between branches is by using the svn merge command. Assuming you have a working copy of trunk in ~/gramps/trunk and a working copy of the 3.3 branch in ~gramps/gramps33gramps{{stable_branch}}: gramps33gramps{{stable_branch}}$ svn commit gramps33gramps{{stable_branch}}$ cd ../trunk trunk$ svn merge -c REVISION https://gramps.svn.sourceforge.net/svnroot/gramps/branches/maintenance/gramps33gramps{{stable_branch}}/
trunk$ svn commit
===Using svn diff===
You can also create a patch on gramps33 gramps{{stable_branch}} branch and apply it to trunk: gramps33gramps{{stable_branch}}$ svn diff -r PREV > ~/mypatch.patch gramps33gramps{{stable_branch}}$ cd ../trunk
trunk$ patch -p0 < ~/mypatch.patch
