From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: splitting ChangeLogs Date: Wed, 06 Apr 2011 12:53:21 -0400 Message-ID: References: <83k4f8uls8.fsf@gnu.org> <83hbabv1ol.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1302108822 12593 80.91.229.12 (6 Apr 2011 16:53:42 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 6 Apr 2011 16:53:42 +0000 (UTC) Cc: emacs-devel@gnu.org, lekktu@gmail.com To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 06 18:53:38 2011 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.69) (envelope-from ) id 1Q7Vz6-0007eQ-G7 for ged-emacs-devel@m.gmane.org; Wed, 06 Apr 2011 18:53:36 +0200 Original-Received: from localhost ([127.0.0.1]:56227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q7Vz6-0004Cz-0T for ged-emacs-devel@m.gmane.org; Wed, 06 Apr 2011 12:53:36 -0400 Original-Received: from [140.186.70.92] (port=54136 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q7Vz0-0004Cp-TC for emacs-devel@gnu.org; Wed, 06 Apr 2011 12:53:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q7Vyz-0005t6-Ui for emacs-devel@gnu.org; Wed, 06 Apr 2011 12:53:30 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:34651 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q7Vyy-0005sd-BC; Wed, 06 Apr 2011 12:53:28 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAFSanE1FpZU1/2dsb2JhbACleHiIeblkhWwElms X-IronPort-AV: E=Sophos;i="4.63,311,1299474000"; d="scan'208";a="103435969" Original-Received: from 69-165-149-53.dsl.teksavvy.com (HELO pastel.home) ([69.165.149.53]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 06 Apr 2011 12:53:24 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id A43CB58FA9; Wed, 6 Apr 2011 12:53:21 -0400 (EDT) In-Reply-To: <83hbabv1ol.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 06 Apr 2011 18:28:58 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.183 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:138253 Archived-At: >> > I thought the ChangeLog entries from the emacs-23 branch are merged >> > manually. If they are merged automatically, then you are right. >> The merge is automatic, and the resulting conflicts can either be >> resolved automatically (e.g. via smerge-resolve or a bzr plugin), >> or manually. > What conflicts? there are no conflicts (assuming you have the > changelog_merge plugin). Well, in my view, the changelog_merge plugin resolves conflicts resulting from a merge more than it performs a merge, but I don't know if the implementation matches my mental image of it. Stefan