From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: Relicensing the Emacs repository Date: Thu, 26 Jul 2007 11:13:00 +0900 Organization: NEC Electronics Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1185416033 10061 80.91.229.12 (26 Jul 2007 02:13:53 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 26 Jul 2007 02:13:53 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 26 04:13:49 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IDsrM-0002Hg-V2 for ged-emacs-devel@m.gmane.org; Thu, 26 Jul 2007 04:13:49 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IDsrL-0002jv-MJ for ged-emacs-devel@m.gmane.org; Wed, 25 Jul 2007 22:13:47 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IDsrH-0002jq-RG for emacs-devel@gnu.org; Wed, 25 Jul 2007 22:13:43 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IDsrF-0002jd-NZ for emacs-devel@gnu.org; Wed, 25 Jul 2007 22:13:42 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IDsrF-0002ja-Ka for emacs-devel@gnu.org; Wed, 25 Jul 2007 22:13:41 -0400 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1IDsrF-0001Uo-BG for emacs-devel@gnu.org; Wed, 25 Jul 2007 22:13:41 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1IDsr8-0004Nt-Rv for emacs-devel@gnu.org; Thu, 26 Jul 2007 04:13:34 +0200 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 Jul 2007 04:13:34 +0200 Original-Received: from miles.bader by fencepost.gnu.org with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 Jul 2007 04:13:34 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 17 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: fencepost.gnu.org System-Type: i686-pc-linux-gnu Blat: Foop Cancel-Lock: sha1:U8mzZwip6IDWeG21IexQSuR/zSs= X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:75547 Archived-At: Glenn Morris 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