From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/58363 Path: main.gmane.org!not-for-mail From: Reiner Steib <4.uce.03.r.s@nurfuerspam.de> Newsgroups: gmane.emacs.gnus.general Subject: Re: Sync of Gnus with Emacs Date: Tue, 31 Aug 2004 17:58:31 +0200 Organization: Dept. of Theoretical Physics, University of Ulm Sender: ding-owner@lists.math.uh.edu Message-ID: References: <4nvff9lu28.fsf@lifelogs.com> Reply-To: Reiner Steib NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1093968272 14067 80.91.224.253 (31 Aug 2004 16:04:32 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 31 Aug 2004 16:04:32 +0000 (UTC) Original-X-From: ding-owner+M6904@lists.math.uh.edu Tue Aug 31 18:04:07 2004 Return-path: Original-Received: from malifon.math.uh.edu ([129.7.128.13]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1C2B78-0004GP-00 for ; Tue, 31 Aug 2004 18:04:06 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu ident=lists) by malifon.math.uh.edu with smtp (Exim 3.20 #1) id 1C2B23-0000Wq-00; Tue, 31 Aug 2004 10:58:51 -0500 Original-Received: from util2.math.uh.edu ([129.7.128.23]) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 1C2B1y-0000Wl-00 for ding@lists.math.uh.edu; Tue, 31 Aug 2004 10:58:46 -0500 Original-Received: from justine.libertine.org ([66.139.78.221] ident=postfix) by util2.math.uh.edu with esmtp (Exim 4.30) id 1C2B1x-00059Z-9v for ding@lists.math.uh.edu; Tue, 31 Aug 2004 10:58:45 -0500 Original-Received: from main.gmane.org (main.gmane.org [80.91.224.249]) by justine.libertine.org (Postfix) with ESMTP id EDD433A0078 for ; Tue, 31 Aug 2004 10:58:41 -0500 (CDT) Original-Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1C2B1r-0000fh-00 for ; Tue, 31 Aug 2004 17:58:39 +0200 Original-Received: from lumberjack.physik.uni-ulm.de ([134.60.10.173]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 31 Aug 2004 17:58:39 +0200 Original-Received: from Reiner.Steib by lumberjack.physik.uni-ulm.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 31 Aug 2004 17:58:39 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-To: ding@gnus.org Original-Lines: 54 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: lumberjack.physik.uni-ulm.de X-Face: :6KQZ[nyoS_edmB.%gw-=)BYth^|2+Y+^cu%I$FSx!&>-'om>3H7A|M&n(V7fIo3P.;yo.b yq4$p;ZaBtkv)\}biaiBQe"mD}iib1AA@99-fZ7i*bLhNRVC&0Wkxg9)SH?oWc@{ Mail-Copies-To: nobody User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3.50 (gnu/linux) Cancel-Lock: sha1:JZeuuglFSywtoQuqMndMayRbgoc= Precedence: bulk Xref: main.gmane.org gmane.emacs.gnus.general:58363 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:58363 On Tue, Aug 24 2004, Reiner Steib wrote: > Here is a suggestion on how to do it rather convenient (suggestions > for improvement very welcome): Because cvs unable to show diffs on a branch, we should generously add tags before and after merging: - Update and tag the v5-10 branch with a pre-merge tag: cd /path/to/v5-10 cvs update cvs tag "gnus-5_10-pre-merge-whatever" > - Open the ChangeLog file in the No Gnus directory. > > - Goto 2004-01-04 (No Gnus starts here). Search for your name with > `C-r'. > > - (If the entry might be relevant:) > Open the source file(s) *in the v5-10* directory, browse the log > with `C-x v l', use `d' (log-view-diff) to view the change. > > If relevant, apply the hunk(s) using `C-c C-a' from the *vc-diff* > buffer. Add the ChangeLog entry using the current date. Commit. ^^^^^^^^^^^^ According to RMS' advice, I changed the ChangeLog dates to the date of the installation of the change in the respective branch. The dates in the ChangeLog file should be monotonic. > - Do this for the ChangeLogs in texi/ and lisp/. - Tag the v5-10 branch with a post-merge tag: cd /path/to/v5-10 cvs tag "gnus-5_10-post-merge-whatever" In this way, we can create whatever.patch using... cvs diff -r "gnus-5_10-pre-merge-whatever" \ -r "gnus-5_10-post-merge-whatever" > whatever.patch ... and apply it in Emacs' repository. > - Post a message in this thread that you have checked (and installed) > your changes. Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/