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 13:23:31 +0200 Message-ID: <87txnghrrg.fsf@bzg.ath.cx> References: <20130409102803.GB10276@saturn> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1365506620 4967 80.91.229.3 (9 Apr 2013 11:23:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 9 Apr 2013 11:23:40 +0000 (UTC) Cc: Christopher Schmidt , emacs-devel@gnu.org To: Giorgos Keramidas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 09 13:23:44 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 1UPWeJ-0008Cr-HW for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 13:23:39 +0200 Original-Received: from localhost ([::1]:35117 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPWeJ-0004i5-2G for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 07:23:39 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:60445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPWeE-0004f4-Sm for emacs-devel@gnu.org; Tue, 09 Apr 2013 07:23:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPWeD-0008Lh-4b for emacs-devel@gnu.org; Tue, 09 Apr 2013 07:23:34 -0400 Original-Received: from mail-wg0-f45.google.com ([74.125.82.45]:55174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPWeC-0008Lb-ST for emacs-devel@gnu.org; Tue, 09 Apr 2013 07:23:33 -0400 Original-Received: by mail-wg0-f45.google.com with SMTP id x12so6940909wgg.12 for ; Tue, 09 Apr 2013 04:23:32 -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=uIeqHXs6Y2YejO9A9X6iyzdbl1Eb+qeeAxp0f2HBtHA=; b=EEkdb4WFxxmZRiKR63xf5QKS3AXkbPHaw1eOa2XDvWCtyjJ4jVih/CsVv8PnVE1fgT 3ylOupNyK1Vg2T29YIJrZDi4vw0G6iTGMYLVrwzhn+7KLXE9QmUHLLSuunAYMoMK6jtf RUPs9yraHZI9wrDgXmbDqMxaRdyEL3LdiL25QgMcN7nfq/GvP5wbnJifH0/6aYEqwlAj SS1k2gPIanQ58lmxwNg+DyK45G6ncXlVBuSVsm8QphF2bIRHMe3kFIRkCQqVblt7zIE5 ki/EumLoJA8bWzN6w/T1XmyIeTvzsyrLjPYNhbJajR5/W3f2F4dRerDzw0VFvNuGlUXx zYXg== X-Received: by 10.194.220.37 with SMTP id pt5mr37520271wjc.16.1365506612100; Tue, 09 Apr 2013 04:23:32 -0700 (PDT) Original-Received: from bzg.localdomain ([78.250.170.241]) by mx.google.com with ESMTPS id k5sm28166855wiy.5.2013.04.09.04.23.30 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Apr 2013 04:23:31 -0700 (PDT) Original-Received: by bzg.localdomain (Postfix, from userid 1000) id 540941C2101B; Tue, 9 Apr 2013 13:23:31 +0200 (CEST) In-Reply-To: <20130409102803.GB10276@saturn> (Giorgos Keramidas's message of "Tue, 9 Apr 2013 12:28:04 +0200") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.82.45 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:158800 Archived-At: Hi Giorgos, Giorgos Keramidas writes: > That's because leim/ja-dic/ was removed recently, but if you are merging > in an unclean checkout (with build output from previous builds), bzr > notices that: > > (a) The directory should be removed as part of the merge > (b) The directory is not empty > > So it takes the safer approach of aborting the merge with a conflict, > instead of blindly removing the directory. > > This is an artifact of the fact that bzr likes tracking directory > changes too, as part of the branch history. In this case it acts a bit > silly, because there are *no* files tracked remaining after the > directory is fully removed from a branch, so it should just go ahead and > remove the directory from the branch, but leave the filesystem intact. > Since there are no files left in the originally tracked directory, > future merges or updates will not care about this path anyway. > > Running 'bzr resolve --take-other' basically tells bzr to ignore > whatever happens to exist in the filesystem because of the local branch > and consider the 'source branch' the authoritative source of what it > should do with leim/ja-dic/. And it solves this minor merge problem > ;) Thanks for the detailed explanation -- will remember this next time. -- Bastien