[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Gnus branch
From: |
Stefan Monnier |
Subject: |
Re: Gnus branch |
Date: |
19 Aug 2004 14:26:18 -0400 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 |
> I'm not sure how to handle the ChangeLog entries from Emacs/trunk:
> Assuming that all the changes that we want are in the branch now,
> and that the ChangeLog file in that branch describes those changes,
> you should copy the ChangeLog file unmodified into the trunk
> just as you copy the source files unmodified into the trunk.
> However, it sounds like you're saying we have not yet reached that point:
> Some other (maybe) important changes (by Stefan Monnier, Juanma
> Barranquero, Kim F. Storm, Sam Steingold, ...) have not been installed
> yet.
> Can you identify these changes and merge the ones we need
> into the branch?
Just to clarify: my suggestion is to first merge the gnus branch on the
trunk and then re-install the local changes that haven't made their way to
the Gnus repository yet.
For clarity of the history (i.e. to make future integration easier) it is
important to have a Gnus branch that only contains code that comes from the
Gnus repository. So we should either create a second Gnus branch (one for
importing from the repository and a temporary one to do the current
integration work before committing it to the trunk) or instead to just do
the integration work directly on the trunk, which is easier.
Stefan
- Gnus branch, Stefan Monnier, 2004/08/12
- Re: Gnus branch, David Kastrup, 2004/08/12
- Re: Gnus branch, Richard Stallman, 2004/08/13
- Re: Gnus branch, Reiner Steib, 2004/08/22
- Re: Gnus branch, Reiner Steib, 2004/08/22
- Re: Gnus branch, Reiner Steib, 2004/08/30
- Re: Gnus branch, Katsumi Yamaoka, 2004/08/30
- Re: Gnus branch, Katsumi Yamaoka, 2004/08/31
- Re: Gnus branch, Richard Stallman, 2004/08/31
- Re: Gnus branch, Miles Bader, 2004/08/31
Re: Gnus branch, Reiner Steib, 2004/08/22