From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Christopher Schmidt Newsgroups: gmane.emacs.devel Subject: Re: bzr commit raises a weird conflict Date: Tue, 9 Apr 2013 09:42:39 +0100 (BST) Message-ID: <87zjx8hz7b@ch.ristopher.com> References: <87txngta6a.fsf@bzg.ath.cx> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1365496968 32668 80.91.229.3 (9 Apr 2013 08:42:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 9 Apr 2013 08:42:48 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 09 10:42:52 2013 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 1UPU8h-0005d9-3A for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 10:42:51 +0200 Original-Received: from localhost ([::1]:46242 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPU8g-0001JC-M0 for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 04:42:50 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:46224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPU8a-0001Ev-N2 for emacs-devel@gnu.org; Tue, 09 Apr 2013 04:42:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPU8X-0007CD-Lb for emacs-devel@gnu.org; Tue, 09 Apr 2013 04:42:44 -0400 Original-Received: from ristopher.com ([146.185.21.93]:38842 helo=saturn.ch.ristopher.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPU8X-0007AI-AT for emacs-devel@gnu.org; Tue, 09 Apr 2013 04:42:41 -0400 Original-Received: by saturn.ch.ristopher.com (Postfix, from userid 0) id 52CBE20E13; Tue, 9 Apr 2013 09:42:39 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=ch.ristopher.com; s=mail; t=1365496959; bh=t6pOHF4aDY3tiWbffv9887+CpBwX2qzEXqKGN3Xn+2I=; h=From:To:Subject:In-Reply-To:Message-ID:References:MIME-Version: Content-Type:Date; b=W2AwwSfw/ND5nLZm3RAj+O0b11YiSkQ0VMfZzKlnAbVofKzY0JnNKVpNy7LS0ul9R jWCUv0g8xIL1JbwVU/lW7qDpx5IPTakup8SsdSWNd9wtEyQwraqrifh9N85aBynSVl VRqhlAm+h6rPVgyAQNBXjLVtjdkureYxV6tW0AR8= In-Reply-To: <87txngta6a.fsf@bzg.ath.cx> (Bastien's message of "Tue, 09 Apr 2013 09:50:21 +0200") Mail-Followup-To: emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 146.185.21.93 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:158795 Archived-At: Bastien writes: > How can I resolve this "conflict"? > > I know it safer to build from a dedicated branch, and to use a clean > branch for commits, but still, I don't understand what's wrong. I don't understand what's wrong, either. bzr resolve --take-other solved it for me. This is probably another bug in bzr. Christopher