svn.rst
author Oleksandr Gavenko <gavenkoa@gmail.com>
Sat, 04 Dec 2010 17:10:45 +0200
changeset 735 5c437e2d5fe1
parent 396 44668f040a5d
child 778 67a292e6d70b
permissions -rw-r--r--
Fix Emacs settings.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
735
5c437e2d5fe1 Fix Emacs settings.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 396
diff changeset
     1
-*- mode: outline; coding: utf-8; fill-column: 80 -*-
98
fc020f519c58 Copy repo from SourceForge to GoogleCode.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     2
281
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
     3
* Where palced config files?
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
     4
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
     5
The per-user configuration area currently contains three files—two
282
8914938042d4 Disable interactive conflict resolution.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 281
diff changeset
     6
configuration files ('config' and 'servers').
281
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
     7
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
     8
  /etc/subversion
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
     9
                Unix system wide configurations.
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
    10
  $HOME/.subversion
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
    11
                Unix per-user configuration area.
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
    12
  %APPDATA%\Subversion
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
    13
                Windows per-user configuration area.
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
    14
86fb7c1159d6 Where palced config files?
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 98
diff changeset
    15
98
fc020f519c58 Copy repo from SourceForge to GoogleCode.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    16
* Copy repo from SourceForge to GoogleCode.
fc020f519c58 Copy repo from SourceForge to GoogleCode.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    17
fc020f519c58 Copy repo from SourceForge to GoogleCode.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    18
  $ svnsync init https://PROJ.googlecode.com/svn https://PROJ.svn.sourceforge.net/svnroot/PROJ
fc020f519c58 Copy repo from SourceForge to GoogleCode.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    19
  $ svnsync --username NAME --password PASSWORD \
fc020f519c58 Copy repo from SourceForge to GoogleCode.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    20
                sync https://PROJ.googlecode.com/svn https://PROJ.svn.sourceforge.net/svnroot/PROJ
282
8914938042d4 Disable interactive conflict resolution.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 281
diff changeset
    21
8914938042d4 Disable interactive conflict resolution.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 281
diff changeset
    22
* Disable interactive conflict resolution.
8914938042d4 Disable interactive conflict resolution.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 281
diff changeset
    23
8914938042d4 Disable interactive conflict resolution.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 281
diff changeset
    24
Write in '$HOME/.subversion/config'
8914938042d4 Disable interactive conflict resolution.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 281
diff changeset
    25
8914938042d4 Disable interactive conflict resolution.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 281
diff changeset
    26
  interactive-conflicts = no
390
01fc5dc8e0db Run local svn server.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 282
diff changeset
    27
395
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    28
* Creating svn repo.
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    29
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    30
  $ mkdir -p /srv/svn
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    31
  $ svnadmin create /srv/svn/$repo
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    32
  $ svn co file:///srv/svn/$repo $repo
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    33
  $ cd /tmp/$repo
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    34
  $ mkdir trunk branches features tags
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    35
  $ svn add *
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    36
  $ svn st      # check all OK
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    37
  $ svn ci -m "Init repo."
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    38
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    39
For multi-project repo do follow:
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    40
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    41
  $ mkdir -p /srv/svn
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    42
  $ svnadmin create /srv/svn/$repo
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    43
  $ svn co file:///srv/svn/$repo $repo
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    44
  $ cd /tmp/$repo
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    45
  $ for proj in $proj1 $proj2; do mkdir $proj/trunk $proj/branches $proj/features $proj/tags; done
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    46
  $ svn add *
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    47
  $ svn st      # check all OK
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    48
  $ svn ci -m "Init repo."
51561eef9a7d Creating svn repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 390
diff changeset
    49
390
01fc5dc8e0db Run local svn server.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 282
diff changeset
    50
* Run local svn server.
01fc5dc8e0db Run local svn server.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 282
diff changeset
    51
01fc5dc8e0db Run local svn server.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 282
diff changeset
    52
  $ svnserve.exe -d --pid-file=svnserve.pid --root=/srv/svn/proj  # default port: 3690
01fc5dc8e0db Run local svn server.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 282
diff changeset
    53
  $ svn ls svn://localhost    # check all OK
01fc5dc8e0db Run local svn server.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 282
diff changeset
    54
  $ kill -l
396
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    55
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    56
* Undo bad commit.
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    57
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    58
  $ emacs FILE
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    59
...
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    60
  $ svn ci -m "Introduce first bug."
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    61
Sending        trunk/FILE
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    62
Transmitting file data .
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    63
Committed revision 7.
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    64
  $ emacs FILE
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    65
...
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    66
  $ svn ci -m "Make a lot of good changes."
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    67
...
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    68
Committed revision 8.
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    69
...
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    70
  $ emacs FILE
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    71
...
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    72
  $ svn ci -m "Introduce second bug."
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    73
...
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    74
Committed revision 10.
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    75
  $ emacs FILE
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    76
...
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    77
  $ svn ci -m "Make a lot of good changes."
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    78
...
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    79
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    80
Now you understand that revision 7 and 10 buggy. You decide revert changes:
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    81
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    82
  $ svn merge -r 7:6 -r 10:9 FILE
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    83
  $ svn ci -m "Reverted revision 7 and 10."
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    84
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    85
For one changeset revert you can use shortly syntax:
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    86
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    87
  $ svn merge -c -7 -c -10 FILE
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    88
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    89
Also you can use long diapason:
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    90
44668f040a5d Undo bad commit.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 395
diff changeset
    91
  $ svn merge -r 10:6 FILE