From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23746 invoked from network); 15 Jun 2004 20:46:28 -0000 Received: from unknown (HELO lists.gnu.org) (199.232.76.165) by sourceware.org with SMTP; 15 Jun 2004 20:46:28 -0000 Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BaKq7-0004Jz-N9 for listarch-gnats-devel@sources.redhat.com; Tue, 15 Jun 2004 16:47:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1BaKq2-0004IT-MZ for help-gnats@gnu.org; Tue, 15 Jun 2004 16:47:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1BaKq1-0004Hy-0T for help-gnats@gnu.org; Tue, 15 Jun 2004 16:47:22 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BaKq0-0004Hv-Tw for help-gnats@gnu.org; Tue, 15 Jun 2004 16:47:20 -0400 Received: from [199.199.210.160] (helo=chef.nerp.net) by monty-python.gnu.org with esmtp (Exim 4.34) id 1BaKoz-0007p1-Qq for help-gnats@gnu.org; Tue, 15 Jun 2004 16:46:18 -0400 Received: from localhost (c-66-41-158-97.mn.client2.attbi.com [66.41.158.97]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by chef.nerp.net (Postfix) with ESMTP id AF6431FB4F for ; Tue, 15 Jun 2004 15:46:16 -0500 (CDT) Received: from chewie by localhost with local (Exim 4.32) id 1BaKox-0006ca-Bt for help-gnats@gnu.org; Tue, 15 Jun 2004 15:46:15 -0500 Date: Thu, 17 Jun 2004 16:48:00 -0000 From: Chad Walstrom To: help-gnats@gnu.org Message-ID: <20040615204615.GH19638@wookimus.net> Mail-Followup-To: help-gnats@gnu.org References: <20040615192846.GG19638@wookimus.net> Mime-Version: 1.0 In-Reply-To: <20040615192846.GG19638@wookimus.net> X-Operating-System: Linux skuld 2.6.4-k7 X-GnuPG-Fingerprint: B4AB D627 9CBD 687E 7A31 1950 0CC7 0B18 206C 5AFD Keywords: none User-Agent: Mutt/1.5.5.1+cvs20040105i Subject: CVS Branching and Merging X-BeenThere: help-gnats@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: General discussion about GNU GNATS List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0511901812==" Sender: help-gnats-bounces+listarch-gnats-devel=sources.redhat.com@gnu.org Errors-To: help-gnats-bounces+listarch-gnats-devel=sources.redhat.com@gnu.org X-SW-Source: 2004-q2/txt/msg00170.txt.bz2 --===============0511901812== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="bygAmIonOAIqBxQB" Content-Disposition: inline --bygAmIonOAIqBxQB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-length: 1566 Chad Walstrom wrote: > As far as a timeline, I would like to start preparing a 4.1 > pre-release ASAP. There have been some CVS updates since the original > 4.0 release, and it's a good time mark the codebase before branching > off for the big changes in 4.2 and 5.0. Let me rephrase that. We should probably branch releases and leave the trunk as the development branch. In which case, we tag the trunk for the 4.1 release as release_4_1, then create the maintenance branch as release_4_1_branch. Patch releases to the 4.1 series would then be tagged from that branch: release_4_1_1, etc. We don't need to get carried away with judicious branching, but if you feel comfortable using a branch to work on feature enhancements, please feel free to do so. Let's leave the trunk for merging. For example, Mel is planning big changes, so perhaps he branches off the trunk as {featurename|author}_{revision-branching-from}_dev =20=20=20=20 And, when you're ready to merge to the trunk, merge from the trunk to get the updates and tag (with '_merge') after conflicts are resolved. Then whoever is in charge of merging to the trunk will pull from that tag. Once merged, we can tag the target trunk/branch with a "_merged" tag. Ideas? Overkill? I know CVS operations to savannah are a bit slow, but it's workable. What do you all think of judicious tagging? i.e. Tagging the merge-points of bug fixes or feature additions? --=20 Chad Walstrom http://www.wookimus.net/ assert(expired(knowledge)); /* core dump */ --bygAmIonOAIqBxQB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline Content-length: 189 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) iD8DBQFAz2AXDMcLGCBsWv0RArIIAJ918ozDbEWvzERnvHGd63qizHpMnQCfY5D+ KyFGK3C1D2NfxCTQlYmbYvs= =TkmF -----END PGP SIGNATURE----- --bygAmIonOAIqBxQB-- --===============0511901812== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline Content-length: 140 _______________________________________________ Help-gnats mailing list Help-gnats@gnu.org http://lists.gnu.org/mailman/listinfo/help-gnats --===============0511901812==--