From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: master 069a0e4: Sync with soap-client repository, version 3.0.0 Date: Sun, 25 Oct 2015 20:41:24 +0200 Message-ID: <83r3kidc4r.fsf@gnu.org> References: <20151024123557.27656.88941@vcs.savannah.gnu.org> <3la8r8kvdl.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1445798495 19192 80.91.229.3 (25 Oct 2015 18:41:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 25 Oct 2015 18:41:35 +0000 (UTC) Cc: rgm@gnu.org, emacs-devel@gnu.org To: Thomas Fitzsimmons Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Oct 25 19:41:27 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZqQEO-0006VJ-KY for ged-emacs-devel@m.gmane.org; Sun, 25 Oct 2015 19:41:24 +0100 Original-Received: from localhost ([::1]:49110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqQEO-0003tY-3j for ged-emacs-devel@m.gmane.org; Sun, 25 Oct 2015 14:41:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqQEL-0003tT-MU for emacs-devel@gnu.org; Sun, 25 Oct 2015 14:41:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZqQEH-00044m-Fw for emacs-devel@gnu.org; Sun, 25 Oct 2015 14:41:21 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:41785) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqQEH-00043w-8C; Sun, 25 Oct 2015 14:41:17 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NWS00B00H7ZUK00@a-mtaout22.012.net.il>; Sun, 25 Oct 2015 20:41:14 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NWS00BXNH8QTT00@a-mtaout22.012.net.il>; Sun, 25 Oct 2015 20:41:14 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:192610 Archived-At: > From: Thomas Fitzsimmons > Date: Sun, 25 Oct 2015 00:25:43 -0400 > Cc: emacs-devel@gnu.org > > To reduce tedium and precisely represent authorship and history within > the Emacs repository, maybe it would make sense to add emacs-soap-client > as a Git subtree, like GNU Elpa allows for externally-hosted projects. > Is that an option for the main Emacs Git repository? We need to be able to produce a ChangeLog from the Git commit log, see ChangeLog.2. That is why Glenn requested to include proper commit logs when merging. I see that you maintain a ChangeLog file in the repository. Can't you simply copy that into the merge commit log, after deleting the date-and-name headers? That would go a long way towards solving the issue without undue hardships for you, I think.