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: Wed, 10 Apr 2013 08:38:19 +0100 (BST) Message-ID: <87zjx6sumu@ch.ristopher.com> References: <87txngta6a.fsf@bzg.ath.cx> <87zjx8hz7b@ch.ristopher.com> <8338uzbuu5.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1365579536 17970 80.91.229.3 (10 Apr 2013 07:38:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 10 Apr 2013 07:38:56 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 10 09:38:59 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 1UPpcQ-0005rv-LK for ged-emacs-devel@m.gmane.org; Wed, 10 Apr 2013 09:38:58 +0200 Original-Received: from localhost ([::1]:50703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPpcQ-0005I7-AF for ged-emacs-devel@m.gmane.org; Wed, 10 Apr 2013 03:38:58 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:36687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPpbw-0004r0-CL for emacs-devel@gnu.org; Wed, 10 Apr 2013 03:38:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPpbq-0004po-Gy for emacs-devel@gnu.org; Wed, 10 Apr 2013 03:38:28 -0400 Original-Received: from ristopher.com ([146.185.21.93]:39038 helo=saturn.ch.ristopher.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPpbq-0004pA-80 for emacs-devel@gnu.org; Wed, 10 Apr 2013 03:38:22 -0400 Original-Received: by saturn.ch.ristopher.com (Postfix, from userid 0) id A567620E13; Wed, 10 Apr 2013 08:38:19 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=ch.ristopher.com; s=mail; t=1365579499; bh=tXcbAxlIANLj359Zzxo93gKEUeYKuZjMktTCBN4XOCs=; h=From:To:Subject:In-Reply-To:Message-ID:References:MIME-Version: Content-Type:Date; b=RpWolOas9AZExZJUjsNUa6bdNf3fbG4DJwjHOWnhqI6rFmjSSz7B/Se5yOSOThM/w 1FpHHhc087xJry+4d2M6Ii+bjbxnElXsKkg3uHJgHhVQuRk0BE8vxBk4qssOWbeAfr 08xpKQMdg22FQavl2kg25mJlZ5O5FdQXpPK83JHc= In-Reply-To: <8338uzbuu5.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 09 Apr 2013 18:13:38 +0300") 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:158818 Archived-At: Eli Zaretskii writes: >> From: Christopher Schmidt >> bzr resolve --take-other >> solved it for me. This is probably another bug in bzr. Hi Eli, thank you very much for your explanation. I should have investigated before calling in another bug. I will be more careful next time. My apologies for the noise. Greetings, Christopher