Re: Sync of Gnus with Emacs

[Reiner Steib <4.uce.03.r.s@nurfuerspam.de>]

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/