From 9b0d08b36c6802acdf9aaa9de7afc632896286b4 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Sat, 6 Aug 2005 17:17:13 +0000 Subject: [PATCH] * cvs-server.txt: update instructions after branching 6.1-stable. --- ChangeLog | 4 ++++ configure.in | 4 ++-- cvs-server.txt | 12 +++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddc5200..93f5777 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-08-06 Erez Zadok + + * cvs-server.txt: update instructions after branching 6.1-stable. + 2005-08-02 Erez Zadok ******************************************************************* diff --git a/configure.in b/configure.in index 0d2ffdc..d365368 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,7 @@ dnl INITIALIZATION dnl AC_INIT dnl new init style: PACKAGE, VERSION, BUG-REPORTING-ADDRESS AC_INIT([am-utils], - [6.1.2-rc1], + [6.2a1], [https://bugzilla.am-utils.org/ or am-utils@am-utils.org]) AC_MSG_NOTICE(*** INITIALIZATION ***) AC_CONFIG_SRCDIR([amd/amd.c]) @@ -55,7 +55,7 @@ AH_BOTTOM([ dnl dnl AC_CONFIG_AUX_DIR(m4) AC_PREREQ(2.52) -AC_REVISION($Revision: 1.107 $) +AC_REVISION($Revision: 1.108 $) AC_COPYRIGHT([Copyright (c) 1997-2005 Erez Zadok]) dnl find out system type AC_MSG_NOTICE(*** SYSTEM TYPES ***) diff --git a/cvs-server.txt b/cvs-server.txt index cd11ef1..a2a123e 100644 --- a/cvs-server.txt +++ b/cvs-server.txt @@ -7,13 +7,17 @@ Here are generic CVS server instructions: login access on cvs.am-utils.org, then email am-utils-developers@am-utils.org. -(2) Then, check out a fresh copy of 6.1 (experimental) +(2) Then, check out a fresh copy of 6.2 (development branch) $ export CVS_RSH=ssh $ cvs -d ${USER}@cvs.am-utils.org:/home/cvsroot checkout am-utils Or, to checkout the stable branch: +$ cvs -d ${USER}@cvs.am-utils.org:/home/cvsroot checkout -r amd-6-1-stable am-utils + + Or, to checkout the legacy branch: + $ cvs -d ${USER}@cvs.am-utils.org:/home/cvsroot checkout -r amd-6-0-stable am-utils (3) Then you can do normal edit, commit, update, etc. without having to @@ -22,13 +26,15 @@ $ cvs -d ${USER}@cvs.am-utils.org:/home/cvsroot checkout -r amd-6-0-stable am-ut .profile/.login file). ############################################################################## -To merge changes from the stable branch into the main (experimental) branch: +To merge changes from the stable branch into the main (development) branch: -$ cvs update -j amd-6-0-stable -kk +$ cvs update -j amd-6-1-stable -kk - don't worry about all the files that change; it's probably because of cvs keywords in the sources - after the merge, do a 'cvs update -d' and resolve any conflicts +Nevertheless, please exercise caution when merging branches. + ############################################################################## -- 2.43.0