unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Bastien <bzg@gnu.org>
To: emacs-devel@gnu.org
Subject: bzr commit raises a weird conflict
Date: Tue, 09 Apr 2013 09:50:21 +0200	[thread overview]
Message-ID: <87txngta6a.fsf@bzg.ath.cx> (raw)

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




             reply	other threads:[~2013-04-09  7:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-09  7:50 Bastien [this message]
2013-04-09  8:42 ` bzr commit raises a weird conflict Christopher Schmidt
2013-04-09  9:37   ` Bastien
2013-04-09 15:13   ` Eli Zaretskii
2013-04-10  7:38     ` Christopher Schmidt
2013-04-10 15:31       ` Eli Zaretskii
2013-04-12  8:49         ` Bastien
2013-04-09 10:28 ` Giorgos Keramidas
2013-04-09 11:23   ` Bastien
2013-04-09 15:31   ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87txngta6a.fsf@bzg.ath.cx \
    --to=bzg@gnu.org \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).