From a16c46d8f215149b6a3ea5f931846aabaeb0e4dd Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Fri, 28 Apr 2000 17:50:43 +0000 Subject: Notes about using cvs and branch. --- etc/cvs-tips.txt | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 etc/cvs-tips.txt (limited to 'etc/cvs-tips.txt') 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 -- cgit v1.2.3