# HG changeset patch # User Oleksandr Gavenko # Date 1355258523 -7200 # Node ID 0b68966ae7cbd6f666f2a32df13dabd54565c97b # Parent d4399aacf09e967a772a31e90d0e8f6d57cd622e Convert to RST syntax. diff -r d4399aacf09e -r 0b68966ae7cb svn.rst --- a/svn.rst Mon Dec 10 23:28:59 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,92 +0,0 @@ --*- mode: outline; coding: utf-8; -*- - -* Where palced config files? - -The per-user configuration area currently contains three files two -configuration files ('config' and 'servers'). - - /etc/subversion - Unix system wide configurations. - $HOME/.subversion - Unix per-user configuration area. - %APPDATA%\Subversion - Windows per-user configuration area. - - -* Copy repo from SourceForge to GoogleCode. - - $ svnsync init https://PROJ.googlecode.com/svn https://PROJ.svn.sourceforge.net/svnroot/PROJ - $ svnsync --username NAME --password PASSWORD \ - sync https://PROJ.googlecode.com/svn https://PROJ.svn.sourceforge.net/svnroot/PROJ - -* Disable interactive conflict resolution. - -Write in '$HOME/.subversion/config' - - [miscellany] - interactive-conflicts = no - -* Creating svn repo. - - $ mkdir -p /srv/svn - $ svnadmin create /srv/svn/$repo - $ svn co file:///srv/svn/$repo $repo - $ cd /tmp/$repo - $ mkdir trunk branches features tags - $ svn add * - $ svn st # check all OK - $ svn ci -m "Init repo." - -For multi-project repo do follow: - - $ mkdir -p /srv/svn - $ svnadmin create /srv/svn/$repo - $ svn co file:///srv/svn/$repo $repo - $ cd /tmp/$repo - $ for proj in $proj1 $proj2; do mkdir $proj/trunk $proj/branches $proj/features $proj/tags; done - $ svn add * - $ svn st # check all OK - $ svn ci -m "Init repo." - -* Run local svn server. - - $ svnserve.exe -d --pid-file=svnserve.pid --root=/srv/svn/proj # default port: 3690 - $ svn ls svn://localhost # check all OK - $ kill -l - -* Undo bad commit. - - $ emacs FILE -... - $ svn ci -m "Introduce first bug." -Sending trunk/FILE -Transmitting file data . -Committed revision 7. - $ emacs FILE -... - $ svn ci -m "Make a lot of good changes." -... -Committed revision 8. -... - $ emacs FILE -... - $ svn ci -m "Introduce second bug." -... -Committed revision 10. - $ emacs FILE -... - $ svn ci -m "Make a lot of good changes." -... - -Now you understand that revision 7 and 10 buggy. You decide revert changes: - - $ svn merge -r 7:6 -r 10:9 FILE - $ svn ci -m "Reverted revision 7 and 10." - -For one changeset revert you can use shortly syntax: - - $ svn merge -c -7 -c -10 FILE - -Also you can use long diapason: - - $ svn merge -r 10:6 FILE