unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Miles Bader <miles.bader@necel.com>
To: emacs-devel@gnu.org
Subject: Re: Relicensing the Emacs repository
Date: Thu, 26 Jul 2007 11:13:00 +0900	[thread overview]
Message-ID: <buoir87ewur.fsf@dhapc248.dev.necel.com> (raw)
In-Reply-To: uok5soz69z.fsf@fencepost.gnu.org

Glenn Morris <rgm@gnu.org> writes:
> PPS 10. Miles: I seem to recall in the past that you have described
> the merging of changes between branches as only semi-automated. With
> this many files involved, would you prefer me to do the trunk by hand?

It's probably not necessary:  The main thing which causes problems is the
number of conflicts (not the number of files).  Since these changes mainly
involve copyright headers (and a fairly small part at that -- some random
diffs I did showed only "2" -> "3"!), I don't expect there too many conflicts.

Thanks,

-Miles

-- 
Love is a snowmobile racing across the tundra.  Suddenly it flips over,
pinning you underneath.  At night the ice weasels come.  --Nietzsche

  reply	other threads:[~2007-07-26  2:13 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-05  1:31 Relicensing the Emacs repository Richard Stallman
2007-07-06 15:40 ` Reiner Steib
2007-07-08 16:56   ` Richard Stallman
2007-07-09 19:23     ` Reiner Steib
2007-07-25  8:43 ` Glenn Morris
2007-07-25  8:59   ` David Kastrup
2007-07-25 18:29   ` Glenn Morris
2007-07-26  2:13     ` Miles Bader [this message]
2007-07-26  4:42       ` Glenn Morris
2007-07-26 13:24     ` Richard Stallman
2007-07-27  7:12       ` Glenn Morris
2007-07-25 20:11   ` Richard Stallman
2007-07-26  5:31     ` Glenn Morris
2007-07-26 16:59       ` Richard Stallman

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=buoir87ewur.fsf@dhapc248.dev.necel.com \
    --to=miles.bader@necel.com \
    --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 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).