diff options
| author | David Aspinall | 2000-04-28 17:50:43 +0000 |
|---|---|---|
| committer | David Aspinall | 2000-04-28 17:50:43 +0000 |
| commit | a16c46d8f215149b6a3ea5f931846aabaeb0e4dd (patch) | |
| tree | d10d7493663fa98761681cc74f407402a2118b3f /etc | |
| parent | d582b36870f5641c8f369ffb2d5451dc4a597658 (diff) | |
Notes about using cvs and branch.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/README | 1 | ||||
| -rw-r--r-- | etc/cvs-tips.txt | 31 |
2 files changed, 32 insertions, 0 deletions
@@ -18,6 +18,7 @@ example test protocol for example proof scripts notes.txt Misc notes +cvs-tips.txt Notes on cvs with PG project debugging-tips.txt Notes on debugging profiling.txt profiling diff --git a/etc/cvs-tips.txt b/etc/cvs-tips.txt new file mode 100644 index 00000000..a529b398 --- /dev/null +++ b/etc/cvs-tips.txt @@ -0,0 +1,31 @@ + +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=0.1 FULLVERSION=0.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 + + +
\ No newline at end of file |