From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Diff by branch tag and date? Maybe with PCL-CVS? Date: Tue, 31 Aug 2004 16:15:07 +0200 Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: References: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1093961799 23114 80.91.224.253 (31 Aug 2004 14:16:39 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 31 Aug 2004 14:16:39 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 31 16:16:14 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1C29Qk-0001yA-00 for ; Tue, 31 Aug 2004 16:16:14 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1C29Vb-0002Wd-US for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2004 10:21:16 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1C29VV-0002WV-OI for emacs-devel@gnu.org; Tue, 31 Aug 2004 10:21:09 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1C29VR-0002WD-VH for emacs-devel@gnu.org; Tue, 31 Aug 2004 10:21:09 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1C29VR-0002W3-Sm for emacs-devel@gnu.org; Tue, 31 Aug 2004 10:21:05 -0400 Original-Received: from [195.135.220.2] (helo=Cantor.suse.de) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1C29QY-0002w3-Bu for emacs-devel@gnu.org; Tue, 31 Aug 2004 10:16:02 -0400 Original-Received: from hermes.suse.de (hermes-ext.suse.de [195.135.221.8]) (using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)) (No client certificate requested) by Cantor.suse.de (Postfix) with ESMTP id 3AA73B484D8 for ; Tue, 31 Aug 2004 16:15:07 +0200 (CEST) Original-To: emacs-devel@gnu.org X-Yow: I'm meditating on the FORMALDEHYDE and the ASBESTOS leaking into my PERSONAL SPACE!! In-Reply-To: (Reiner Steib's message of "Tue, 31 Aug 2004 16:02:54 +0200") User-Agent: Gnus/5.110002 (No Gnus v0.2) Emacs/21.3.50 (gnu/linux) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:26647 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26647 Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes: > I have a working copy with the gnus-5_10-branch (up to date) and two > quite big patches (KY.patch and SJ.patch) that should be applied to > the branch. (At a later time, I want to be able to identify those > changes.) Is the following procedure correct (and reasonable)? > > cd /path/to/gnus-5_10-branch > cvs update > > cvs tag "gnus-5_10-pre-KY" > patch < KY.patch > cvs commit -m "Merge KY changes" > cvs tag "gnus-5_10-post-KY" > > cvs tag "gnus-5_10-pre-SJ" > patch < SJ.patch > cvs commit -m "Merge SJ changes" > cvs tag "gnus-5_10-post-SJ" Yes, that is a good stategy. Tags are cheap, and retroactive tagging is cumbersome and error prone. Andreas. --=20 Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux AG, Maxfeldstra=DFe 5, 90409 N=FCrnberg, Germany Key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."