blob: 2d270e16f45a9c22d51e49187e6e1d6eee2f4ccb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
-----------------------------------------------------------------
Making a branch to patch a previous release:
cvs checkout -r Release-3-1-3 ProofGeneral
cd ProofGeneral
cvs tag -b Release-3-1-branch
# Drop this repo, has sticky tag for 3-1-3.
cd .. ; cvs release -d ProofGeneral
# Get new one
cvs checkout -r Release-3-1-branch ProofGeneral
cd ProofGeneral
patch ... blah ...
cvs commit ... blah ..
Then make release as ~proofgen:
mkdir oldbranch
cd oldbranch
cvs checkout -r Release-3-1-branch ProofGeneral
make devel.releaseall VERSION=3.1 FULLVERSION=3.1.99
NB: See warning in Makefile.devel about this (it will
downgrade web pages).
Then perhaps merge in branch changes into main stream:
cd projects/proofgen/ProofGeneral
cvs update -jRelease-3-1-branch
NB: this merging will always create conficts with
$Id$ tags in source. (Is there a way to avoid this?)
-----------------------------------------------------------------
Overriding the CVS/Root setting temporarily:
Use
cvs -d $CVSROOT
NB: This doesn't alter CVS/Root, but uses NEWROOT in preference.
($CVSROOT does not overide CVS/Root at all).
Useful command:
alias cvs='cvs -d $CVSROOT'
to force this behaviour.
This is needed to solve "localssh.dcs" versus "ssh.dcs" problem.
|
