From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: bzr commit raises a weird conflict Date: Tue, 09 Apr 2013 18:13:38 +0300 Message-ID: <8338uzbuu5.fsf@gnu.org> References: <87txngta6a.fsf@bzg.ath.cx> <87zjx8hz7b@ch.ristopher.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1365520425 1898 80.91.229.3 (9 Apr 2013 15:13:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 9 Apr 2013 15:13:45 +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 17:13:49 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 1UPaF2-0006K8-H1 for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 17:13:48 +0200 Original-Received: from localhost ([::1]:50305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPaF2-0006Aq-2e for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 11:13:48 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:48027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPaEv-000651-6i for emacs-devel@gnu.org; Tue, 09 Apr 2013 11:13:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPaEn-0008BK-Pz for emacs-devel@gnu.org; Tue, 09 Apr 2013 11:13:41 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:45504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPaEn-0008Az-Fp for emacs-devel@gnu.org; Tue, 09 Apr 2013 11:13:33 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0MKZ00500U7T8O00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Tue, 09 Apr 2013 18:13:27 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MKZ0042KUADQ490@a-mtaout22.012.net.il>; Tue, 09 Apr 2013 18:13:25 +0300 (IDT) In-reply-to: <87zjx8hz7b@ch.ristopher.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:158812 Archived-At: > From: Christopher Schmidt > Date: Tue, 9 Apr 2013 09:42:39 +0100 (BST) > > 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. The directory is removed in the master repository, but not in the local branch. That's a conflict that prevents a clean merge. > bzr resolve --take-other > > solved it for me. This is probably another bug in bzr. It's not a bug, and the above is precisely the way to resolve such conflicts (of course, you could also use --take-mine, but in this case that would be wrong). Bastien, next time you have such non-text conflicts, type bzr help conflict-types and read there (it's a long entry, so redirect to a pager or to an Emacs buffer). In particular, this specific conflict is described under "Deleting parent".