author | Oleksandr Gavenko <gavenkoa@gmail.com> |
Wed, 20 Jul 2011 14:37:56 +0300 | |
changeset 905 | 93b983f80767 |
parent 899 | 7b4265c8d324 |
permissions | -rw-r--r-- |
899
7b4265c8d324
Set fill-column as directory local var.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
779
diff
changeset
|
1 |
-*- mode: outline; coding: utf-8; -*- |
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 |
|
778
67a292e6d70b
Remove illegal char.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
735
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 |
|
779
001f5498a085
Add header for 'interactive-conflicts' option.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
778
diff
changeset
|
26 |
[miscellany] |
282
8914938042d4
Disable interactive conflict resolution.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
281
diff
changeset
|
27 |
interactive-conflicts = no |
390
01fc5dc8e0db
Run local svn server.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
282
diff
changeset
|
28 |
|
395 | 29 |
* Creating svn repo. |
30 |
||
31 |
$ mkdir -p /srv/svn |
|
32 |
$ svnadmin create /srv/svn/$repo |
|
33 |
$ svn co file:///srv/svn/$repo $repo |
|
34 |
$ cd /tmp/$repo |
|
35 |
$ mkdir trunk branches features tags |
|
36 |
$ svn add * |
|
37 |
$ svn st # check all OK |
|
38 |
$ svn ci -m "Init repo." |
|
39 |
||
40 |
For multi-project repo do follow: |
|
41 |
||
42 |
$ mkdir -p /srv/svn |
|
43 |
$ svnadmin create /srv/svn/$repo |
|
44 |
$ svn co file:///srv/svn/$repo $repo |
|
45 |
$ cd /tmp/$repo |
|
46 |
$ for proj in $proj1 $proj2; do mkdir $proj/trunk $proj/branches $proj/features $proj/tags; done |
|
47 |
$ svn add * |
|
48 |
$ svn st # check all OK |
|
49 |
$ svn ci -m "Init repo." |
|
50 |
||
390
01fc5dc8e0db
Run local svn server.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
282
diff
changeset
|
51 |
* Run local svn server. |
01fc5dc8e0db
Run local svn server.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
282
diff
changeset
|
52 |
|
01fc5dc8e0db
Run local svn server.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
282
diff
changeset
|
53 |
$ 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
|
54 |
$ svn ls svn://localhost # check all OK |
01fc5dc8e0db
Run local svn server.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
282
diff
changeset
|
55 |
$ kill -l |
396 | 56 |
|
57 |
* Undo bad commit. |
|
58 |
||
59 |
$ emacs FILE |
|
60 |
... |
|
61 |
$ svn ci -m "Introduce first bug." |
|
62 |
Sending trunk/FILE |
|
63 |
Transmitting file data . |
|
64 |
Committed revision 7. |
|
65 |
$ emacs FILE |
|
66 |
... |
|
67 |
$ svn ci -m "Make a lot of good changes." |
|
68 |
... |
|
69 |
Committed revision 8. |
|
70 |
... |
|
71 |
$ emacs FILE |
|
72 |
... |
|
73 |
$ svn ci -m "Introduce second bug." |
|
74 |
... |
|
75 |
Committed revision 10. |
|
76 |
$ emacs FILE |
|
77 |
... |
|
78 |
$ svn ci -m "Make a lot of good changes." |
|
79 |
... |
|
80 |
||
81 |
Now you understand that revision 7 and 10 buggy. You decide revert changes: |
|
82 |
||
83 |
$ svn merge -r 7:6 -r 10:9 FILE |
|
84 |
$ svn ci -m "Reverted revision 7 and 10." |
|
85 |
||
86 |
For one changeset revert you can use shortly syntax: |
|
87 |
||
88 |
$ svn merge -c -7 -c -10 FILE |
|
89 |
||
90 |
Also you can use long diapason: |
|
91 |
||
92 |
$ svn merge -r 10:6 FILE |