From: joakim@verona.se
To: emacs-devel <emacs-devel@gnu.org>
Subject: Re: merging etc
Date: Sat, 25 Aug 2007 14:45:41 +0200 [thread overview]
Message-ID: <m3mywf3hqi.fsf@kurono.home> (raw)
In-Reply-To: <E1IOmw2-0001pd-Tm@fencepost.gnu.org> (Richard Stallman's message of "Sat\, 25 Aug 2007 00\:07\:42 -0400")
Richard Stallman <rms@gnu.org> writes:
> But I think even CVS would be able to create changelogs directly from
> the commits the way Emacs maintainers wants it, so I dont see what
> switching to git would change in this regard. Its more of a cultural
> issue. (git would of course bring us many other benefits)
>
> The CVS change logs are insufficient because they do not list the
> authors' names. They list who checked in the change.
>
> So that simply is not an option.
That could surely be fixed by adding meta data to the commit. But I'm
not going to argue this point.
Instead I would like ask if its possible to do the merge like this:
- people knowledgeable how to perform the merge with the given tool
contraints do so now, merging mtty to head.
- In the changelog there will be a placeholder:
-------
Merge performed from mtty branch: TODO insert crunched mtty changelog
here.
-------
- somewhere in the Emacs tree there will be a mtty changelog.
- The mtty changelog is crunched piece by piece, and inserted into the
main changelog incrementaly. The corresponding passage in the mtty
changelog is removed to keep track of progress.
I would like to do it this way so several people can work together on
the crunching, and so the merging wont be delayed so people can start
find actual functional problems. Furthermore I dont feel very
comfortable with cvs, and this way feels less likely to mess up.
--
Joakim Verona
next prev parent reply other threads:[~2007-08-25 12:45 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-19 3:17 merging etc Miles Bader
[not found] ` <200708211523.l7LFNnVl000876@oogie-boogie.ics.uci.edu>
[not found] ` <buo3aycknp8.fsf@dhapc248.dev.necel.com>
[not found] ` <200708220820.l7M8KbIt026014@oogie-boogie.ics.uci.edu>
[not found] ` <fc339e4a0708220237v3b90ec6fwde90eba1ca936e91@mail.gmail.com>
2007-08-22 11:55 ` Miles Bader
2007-08-22 15:33 ` Stefan Monnier
2007-08-23 0:19 ` Juri Linkov
2007-08-23 20:58 ` Richard Stallman
2007-08-24 8:01 ` joakim
2007-08-24 8:37 ` Miles Bader
2007-08-24 8:46 ` Leo
2007-08-24 9:03 ` joakim
2007-08-25 4:07 ` Richard Stallman
2007-08-25 12:45 ` joakim [this message]
2007-08-26 2:08 ` Glenn Morris
2007-08-26 2:16 ` gnus inserts headers in body [was Re: merging etc] Glenn Morris
2007-08-26 7:45 ` gnus inserts headers in body Reiner Steib
2007-08-27 1:32 ` Glenn Morris
2007-08-27 5:11 ` David Kastrup
2007-08-26 14:56 ` merging etc Richard Stallman
2007-08-25 19:12 ` Glenn Morris
2007-08-26 1:08 ` Richard Stallman
2007-08-27 5:46 ` Miles Bader
2007-08-24 10:08 ` David Kastrup
2007-08-24 10:41 ` Bootstrap error B. Anyos
2007-08-25 4:07 ` merging etc Richard Stallman
2007-08-23 20:58 ` Richard Stallman
2007-08-23 21:10 ` Stefan Monnier
2007-08-24 16:10 ` Richard Stallman
2007-08-24 17:39 ` Stefan Monnier
2007-08-25 4:06 ` Richard Stallman
2007-08-25 4:22 ` Dan Nicolaescu
2007-08-25 19:17 ` Glenn Morris
2007-08-26 1:08 ` Richard Stallman
2007-08-23 0:45 ` Richard Stallman
2007-08-26 1:05 ` Glenn Morris
2007-08-26 2:02 ` Glenn Morris
2007-08-26 22:47 ` Richard Stallman
2007-08-26 14:56 ` Richard Stallman
2007-08-26 15:53 ` Dan Nicolaescu
2007-08-26 15:51 ` Dan Nicolaescu
[not found] ` <200708290403.l7T43TS6023420@oogie-boogie.ics.uci.edu>
[not found] ` <buoy7fvugg5.fsf@dhapc248.dev.necel.com>
[not found] ` <200708290425.l7T4P4TC023875@oogie-boogie.ics.uci.edu>
[not found] ` <buosl63uf83.fsf@dhapc248.dev.necel.com>
[not found] ` <fc339e4a0708282238q7f45a4ffsb11b27b6c1f6701a@mail.gmail.com>
2007-08-29 13:33 ` Juanma Barranquero
2007-09-13 9:31 ` Juanma Barranquero
2007-09-13 9:48 ` Jason Rumney
2007-09-13 18:51 ` Glenn Morris
2007-08-29 16:12 ` Romain Francoise
2007-08-29 16:17 ` Leo
2007-08-30 7:14 ` Richard Stallman
2007-08-30 8:16 ` joakim
2007-08-30 12:37 ` Stefan Monnier
2007-08-30 12:57 ` David Kastrup
2007-08-30 13:02 ` joakim
2007-08-30 19:56 ` Stefan Monnier
2007-08-31 7:36 ` Richard Stallman
2007-08-30 20:58 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3mywf3hqi.fsf@kurono.home \
--to=joakim@verona.se \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.