annotate DOCS/tech/cvs-howto.txt @ 3149:fc5a2369696e

extended a bit
author arpi
date Tue, 27 Nov 2001 00:12:27 +0000
parents 1333f6184ad3
children d7bd32263398
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2200
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
1
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
2 About CVS write access: by A'rpi
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
3 ~~~~~~~~~~~~~~~~~~~~~~~
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
4
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
5 I. TECH SIDE:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
6 =============
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
7 1. Changing password:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
8
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
9 As you probably got a restricted CVS-only shell, it's not trivial:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
10
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
11 ssh LOGIN@mplayerhq.hu passwd
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
12
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
13 (replace LOGIN with your loginname. leave 'passwd' unchanged, it's command)
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
14
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
15 Note: if you need real shell for something, tell me.
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
16
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
17 2. Checkout devel. source tree:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
18
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
19 export CVS_RSH=ssh
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
20 cvs -z3 -d:ext:LOGIN@mplayerhq.hu:/cvsroot/mplayer co main
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
21
3149
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
22 NOTE: cvs -d:pserver: mode doesn't allow writting, even with password!
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
23
2200
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
24 3. Commiting changes:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
25
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
26 cvs -z3 commit -m "comment - what and why did you change" filename(s)
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
27
3149
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
28 Do not use such comments: "bugfix." or "files changed" or "dunno"
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
29 You don't have to include filename in comment, as comments are linked
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
30 to files. If you have different comments for files, commit them separated,
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
31 not at same time.
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
32
2200
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
33 4. Adding new files/dirs:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
34
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
35 cvs add filename/dirname
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
36
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
37 5. Removing files:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
38
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
39 rm filename
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
40 cvs remove filename
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
41
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
42 6. Check changes:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
43
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
44 cvs -z3 diff -u filename(s)
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
45
3149
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
46 it's recommended to check changes first, before commit. especially if you
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
47 forget what did you change :)
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
48 and this way you will see if your patch has debug stuff or indenting change,
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
49 and you can fix it before commiting and triggering me to use cvs-backup.
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
50
2200
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
51 7. Check changelog:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
52
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
53 cvs -z3 log filename(s)
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
54
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
55 8. Rename/move files:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
56
3149
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
57 you can NOT do that. ask CVS server admin (A'rpi) to do it!
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
58 do NOT remove & re-add file - it will kill changelog!!!!
2200
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
59
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
60 If you have any tech problems with cvs server, contact me:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
61 A'rpi <arpi@thot.banki.hu>
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
62
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
63
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
64 II. POLICY / RULES:
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
65 ===================
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
66
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
67 1. You shouldn't commit code which makes cvs broken!
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
68 (i mean unfinished but enabled code which break
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
69 compiling or compiles but does not work)
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
70
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
71 2. You don't have over-test things. if it works for you,
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
72 and you think it should work for others too, then commit.
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
73 If it has problems (portability, exploits compiler bugs,
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
74 unusual environment etc) they will be reported, it's ok.
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
75
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
76 3. You can commit unfinished stuff (for testing etc), but it
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
77 must be disabled (#ifdef etc) by default.
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
78
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
79 4. Do not change behaviour of the program (renaming options etc)
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
80 without discussing first at the MPlayer-dev-eng list.
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
81
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
82 5. Source indenting and other cosmetical changes are refused.
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
83 I'll remove those commits...
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
84 Every developer has its own indenting style, you shouldn't
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
85 change it. Of course if you (re)write something then you can
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
86 use your own style...
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
87 (Many projects forces a given indenting style - we don't)
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
88
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
89 6. Always fill out the comment at commiting (-m switch of cvs, or
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
90 in the editor if you left -m).
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
91 It shouldn't be such lines: "fixed!" or "Changed it."
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
92 Describe in a few lines (usually 1 line is enough) what did
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
93 you changed and why did you that. You can refer mails if bugfix.
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
94
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
95 7. If you apply patch by someone else, include his name and email
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
96 in the cvs comment!
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
97
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
98 8. I've developed something called CVS-Backup. It archives CVS
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
99 repository after each commit - so I can reverse your commits
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
100 (without messing up changelog) if they are bad.
3149
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
101 If you think your bugfix or other change was bad and unneeded,
fc5a2369696e extended a bit
arpi
parents: 2200
diff changeset
102 ask me to reverse it instead of commiting previous version!
2200
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
103
1333f6184ad3 some ifno for cvs write owners
arpi
parents:
diff changeset
104 I think our rules aren't too hard. If you have comments, contact me.