unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Miles Bader <miles@gnu.org>
To: rms@gnu.org
Cc: Juanma Barranquero <lekktu@gmail.com>, emacs-devel@gnu.org
Subject: Re: linum.el?
Date: Thu, 31 Jan 2008 06:00:35 +0900	[thread overview]
Message-ID: <87d4rj58r0.fsf@catnip.gol.com> (raw)
In-Reply-To: <E1JKJv5-0006Jk-SI@fencepost.gnu.org> (Richard Stallman's message of "Wed, 30 Jan 2008 15:52:31 -0500")

Richard Stallman <rms@gnu.org> writes:
> It's not out of the question to add a modular new feature to Emacs
> 22.2.  If it can't break anything else, it isn't risky.

I've found that even "modular" new features can be pretty annoying in
merging to the trunk -- even if they start out the same on both the
trunk and branch, many files seem to nevertheless generate a lot of
merge conflicts.  Often this is because people make the same change in
different ways on the trunk and on the branch (for instance, due to a
certain function being usable on the trunk but not on the branch).

New features seem to be a bigger problem in this regard than the
majority of the code-base, probably because they tend to get more
development.

-Miles

-- 
Bacchus, n. A convenient deity invented by the ancients as an excuse for
getting drunk.




  reply	other threads:[~2008-01-30 21:00 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-31  9:40 linum.el? Juanma Barranquero
2007-10-31 15:47 ` linum.el? Stefan Monnier
2007-10-31 23:58 ` linum.el? Richard Stallman
2007-11-01  1:39   ` linum.el? Juanma Barranquero
     [not found]     ` <E1J6Y7I-0002zs-C9@fencepost.gnu.org>
2007-12-26 16:09       ` linum.el? Markus Triska
2007-12-26 23:28         ` linum.el? Stefan Monnier
2007-12-27  0:06           ` linum.el? Juanma Barranquero
2007-12-27 18:24             ` linum.el? Richard Stallman
2008-01-20 23:50               ` linum.el? Juanma Barranquero
2008-01-30  2:07                 ` linum.el? Juanma Barranquero
2008-01-30  3:03                   ` linum.el? Miles Bader
2008-01-30  3:18                     ` linum.el? Juanma Barranquero
2008-01-30 13:25                       ` linum.el? Miles Bader
2008-01-30 14:53                         ` linum.el? Juanma Barranquero
2008-01-30 17:01                           ` linum.el? Miles Bader
2008-01-30 20:52                       ` linum.el? Richard Stallman
2008-01-30 21:00                         ` Miles Bader [this message]
2008-01-30 21:27                           ` linum.el? Juanma Barranquero
2008-01-30 22:13                             ` linum.el? Miles Bader
2008-01-30 22:33                               ` linum.el? Juanma Barranquero
2008-01-31 18:51                           ` linum.el? Richard Stallman
2008-01-31 22:05                             ` linum.el? Miles Bader
2007-12-29  7:22             ` linum.el? Stefan Monnier
2007-12-27 18:24           ` linum.el? Richard Stallman
2007-12-29  7:26             ` linum.el? Stefan Monnier
2007-12-29 17:48               ` linum.el? Richard Stallman
2008-01-02  2:12                 ` linum.el? Stefan Monnier
2008-01-03  9:50                   ` linum.el? Richard Stallman
2007-12-27 13:42         ` linum.el? Richard Stallman
2007-12-27 19:18           ` linum.el? Markus Triska
2007-12-28 13:55             ` linum.el? Richard Stallman
2007-12-28 20:22               ` linum.el? Markus Triska
2007-12-29  7:31                 ` linum.el? Stefan Monnier
2007-12-29 13:51                 ` linum.el? Richard Stallman
2007-11-13 17:28 ` linum.el? Juanma Barranquero

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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87d4rj58r0.fsf@catnip.gol.com \
    --to=miles@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=lekktu@gmail.com \
    --cc=rms@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 public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).