From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: bzr commit raises a weird conflict Date: Tue, 09 Apr 2013 09:50:21 +0200 Message-ID: <87txngta6a.fsf@bzg.ath.cx> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1365493833 1330 80.91.229.3 (9 Apr 2013 07:50:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 9 Apr 2013 07:50:33 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 09 09:50:37 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 1UPTK8-0008Nh-6e for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 09:50:36 +0200 Original-Received: from localhost ([::1]:33720 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPTK7-0008Kz-Qs for ged-emacs-devel@m.gmane.org; Tue, 09 Apr 2013 03:50:35 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:60755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPTK4-0008Jz-Nc for emacs-devel@gnu.org; Tue, 09 Apr 2013 03:50:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPTK3-0006fE-D8 for emacs-devel@gnu.org; Tue, 09 Apr 2013 03:50:32 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:54266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPTK3-0006et-79 for emacs-devel@gnu.org; Tue, 09 Apr 2013 03:50:31 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1UPTK0-0008CH-IF for emacs-devel@gnu.org; Tue, 09 Apr 2013 09:50:28 +0200 Original-Received: from mar75-2-81-56-68-112.fbx.proxad.net ([81.56.68.112]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 09 Apr 2013 09:50:28 +0200 Original-Received: from bzg by mar75-2-81-56-68-112.fbx.proxad.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 09 Apr 2013 09:50:28 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 19 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: mar75-2-81-56-68-112.fbx.proxad.net User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:T9YK4glNTq2/8HfZxYZ5W8+qnCc= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:158793 Archived-At: 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"? 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. Thanks for any help, -- Bastien