From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: bzr commit raises a weird conflict Date: Tue, 09 Apr 2013 11:37:26 +0200 Message-ID: <87wqscm4dl.fsf@bzg.ath.cx> References: <87txngta6a.fsf@bzg.ath.cx> <87zjx8hz7b@ch.ristopher.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1365500249 2657 80.91.229.3 (9 Apr 2013 09:37:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 9 Apr 2013 09:37:29 +0000 (UTC) Cc: emacs-devel@gnu.org To: Christopher Schmidt Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 09 11:37:33 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 1UPUzc-0008E8-QD for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 11:37:32 +0200 Original-Received: from localhost ([::1]:48955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPUzb-0005NA-UX for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 05:37:31 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:33689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPUzY-0005N4-Ur for emacs-devel@gnu.org; Tue, 09 Apr 2013 05:37:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPUzX-0008Qs-P9 for emacs-devel@gnu.org; Tue, 09 Apr 2013 05:37:28 -0400 Original-Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]:35465) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPUzX-0008Qm-It for emacs-devel@gnu.org; Tue, 09 Apr 2013 05:37:27 -0400 Original-Received: by mail-wi0-f175.google.com with SMTP id c10so3462103wiw.2 for ; Tue, 09 Apr 2013 02:37:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:in-reply-to:references :user-agent:date:message-id:mime-version:content-type; bh=plJ4iANpbGLgvnda/yYb82bJjKSbowN/1ECmnh1+5ng=; b=wxYwNJkX3If63d63sc+8pcARwpnyPhlR+laQECDnU9RXPlL3wP86itxbeNPX0dBQX7 yZf57StZyE0sxUZ8oK2TflpnyZQo3AYHDu9RLHugAkNsQhdxE7RbOavgoQvTEB/Jh48J lNtxDgjTW0D9x3vktzvIHRVwU4mqgdu/uLuvgm1B3LzzF6hOrUyHKTa7o30Ge3mxKPmW 88geeoO88nsroMXcQS2K5uDBtpduzIYBJyfmmQOGlBGAkh/0BngzLwK+Arb2ThDAuYRK yBk1ZtkW/2kerKnoaZlK+LoKc19rVf2ficoIdTnF+ik7679eefvBOKVEgY9fLkZK8vxW 2eSQ== X-Received: by 10.194.109.227 with SMTP id hv3mr12887405wjb.32.1365500246836; Tue, 09 Apr 2013 02:37:26 -0700 (PDT) Original-Received: from bzg.localdomain (mar75-2-81-56-68-112.fbx.proxad.net. [81.56.68.112]) by mx.google.com with ESMTPS id dp5sm24632240wib.1.2013.04.09.02.37.24 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Apr 2013 02:37:25 -0700 (PDT) Original-Received: by bzg.localdomain (Postfix, from userid 1000) id 151971C20159; Tue, 9 Apr 2013 11:37:26 +0200 (CEST) In-Reply-To: <87zjx8hz7b@ch.ristopher.com> (Christopher Schmidt's message of "Tue, 9 Apr 2013 09:42:39 +0100 (BST)") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22f 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:158798 Archived-At: Hi Christopher, Christopher Schmidt writes: > bzr resolve --take-other > > solved it for me. It did for me as well, thanks for the trick. I've pushed the fix. -- Bastien