From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Giorgos Keramidas Newsgroups: gmane.emacs.devel Subject: Re: bzr commit raises a weird conflict Date: Tue, 9 Apr 2013 12:28:04 +0200 Message-ID: <20130409102803.GB10276@saturn> References: <87wqscm4dl.fsf@bzg.ath.cx> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1365503297 2054 80.91.229.3 (9 Apr 2013 10:28:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 9 Apr 2013 10:28:17 +0000 (UTC) Cc: Christopher Schmidt To: Bastien , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 09 12:28:20 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 1UPVml-0005UN-4B for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 12:28:19 +0200 Original-Received: from localhost ([::1]:56691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPVmk-0005Gk-OA for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 06:28:18 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:48166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPVmf-0005Bu-Gf for emacs-devel@gnu.org; Tue, 09 Apr 2013 06:28:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPVme-000870-60 for emacs-devel@gnu.org; Tue, 09 Apr 2013 06:28:13 -0400 Original-Received: from mail-ea0-x233.google.com ([2a00:1450:4013:c01::233]:34384) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPVmc-00086K-Ne; Tue, 09 Apr 2013 06:28:10 -0400 Original-Received: by mail-ea0-f179.google.com with SMTP id f15so2708145eak.24 for ; Tue, 09 Apr 2013 03:28:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:in-reply-to; bh=U/CvATcA31x/IA8Ba741ipvMa+DGzCixCHJM5eyIC2A=; b=KV8DQi12xWIyBY7zUsf/034JHLGJ6ihfRikkeST4No8zoHrAXY/J70oq+m/aoYJHGt qLkd8Gyzx6z8yhVY22QW8o829pPQCZmhdjk+6DzIHV9wlNjsUtVaxE5viSxmZh8Tedq5 u+y2pNrMgMTRkOqsZUZ5+6LM9N98a7rsgUW8xjIngZysg5oUHEFz//usnbpiGN9FW6ae +urhn6VMcuatEOYO7H8G6zTmRT1BCzTNYc+V2ZRWlz3nuWcfLEHJ3ZGQmpshBEoiVQfV i3w9M3QI6HPVncSa0bZazur6NLlPws2v2IJCRMb6LpOGWAT4mDILjY1151vOJYJSm41Z f7gg== X-Received: by 10.15.107.205 with SMTP id cb53mr58735799eeb.14.1365503289548; Tue, 09 Apr 2013 03:28:09 -0700 (PDT) Original-Received: from saturn (217-162-217-29.dynamic.hispeed.ch. [217.162.217.29]) by mx.google.com with ESMTPS id bc1sm37113781eeb.11.2013.04.09.03.28.08 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 09 Apr 2013 03:28:08 -0700 (PDT) Content-Disposition: inline In-Reply-To: <87wqscm4dl.fsf@bzg.ath.cx> <87zjx8hz7b@ch.ristopher.com> <87txngta6a.fsf@bzg.ath.cx> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::233 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:158799 Archived-At: On 2013-04-09 09:50, Bastien wrote: > I wanted to push a tiny docstring bugfix (bug#14163) but could not. > > "~$ bzr commit" complains about a conflict. > > "~$ bzr conflicts" yields: > Conflict: can't delete leim/ja-dic because it is not empty. Not deleting. > > I first ran "~$ make maintainer-clean" before trying to commit, > because I did build Emacs from this directory. > > How can I resolve this "conflict"? On 2013-04-09 09:42, Christopher Schmidt wrote: > 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. 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 ;) -- Giorgos Keramidas; gkeramidas@gmail.com