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: merge conlict? Date: Mon, 25 Jan 2010 22:02:46 -0500 Message-ID: References: <83vdeq634g.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264474988 5016 80.91.229.12 (26 Jan 2010 03:03:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 03:03:08 +0000 (UTC) Cc: Eli Zaretskii , "Mark A. Hershberger" , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 04:03:00 2010 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 1NZbhj-0001bE-AB for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 04:02:59 +0100 Original-Received: from localhost ([127.0.0.1]:43953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZbhk-0005aT-J8 for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 22:03:00 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZbhe-0005Yq-LN for emacs-devel@gnu.org; Mon, 25 Jan 2010 22:02:54 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZbha-0005Tr-S5 for emacs-devel@gnu.org; Mon, 25 Jan 2010 22:02:54 -0500 Original-Received: from [199.232.76.173] (port=54829 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZbha-0005Tf-PI for emacs-devel@gnu.org; Mon, 25 Jan 2010 22:02:50 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:39149 helo=ironport2-out.pppoe.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZbhY-0005NZ-Io; Mon, 25 Jan 2010 22:02:48 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AhAFAIPqXUtMCo6A/2dsb2JhbACBRtdthDkEik4 X-IronPort-AV: E=Sophos;i="4.49,344,1262581200"; d="scan'208";a="54557409" Original-Received: from 76-10-142-128.dsl.teksavvy.com (HELO pastel.home) ([76.10.142.128]) by ironport2-out.pppoe.ca with ESMTP; 25 Jan 2010 22:02:47 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 0839C88D5; Mon, 25 Jan 2010 22:02:47 -0500 (EST) In-Reply-To: (Andreas Schwab's message of "Mon, 25 Jan 2010 10:26:24 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:120413 Archived-At: >>>>> "Andreas" == Andreas Schwab writes: > Eli Zaretskii writes: >>> Date: Sun, 24 Jan 2010 23:52:26 -0500 >>> From: "Mark A. Hershberger" >>> To: emacs-diffs@gnu.org >>> Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r99379: merge conflict >>> Content-Type: text/plain; charset="us-ascii" >>> >>> ------------------------------------------------------------ >>> revno: 99379 [merge] >>> committer: Mark A. Hershberger >>> branch nick: trunk >>> timestamp: Sun 2010-01-24 23:52:26 -0500 >>> message: >>> merge conflict >> >> What does this "merge conflict" in the commit message mean? Why do >> so many unrelated files (see below) seem to be modified in one go? > That's a normal merge of trunk into a branch. Not much different from > eg. yamaoka@jpl.org-20100121085911-ix6bp10z930y7zn8. I've just added append_revisions_only = True to the .../trunk/.bzr/branch/branch.conf which should reject a "bzr push" that does this kind of ancestor-shifting. Stefan