Re: I can't commit a simple change

[Eli Zaretskii]

> Date: Sat, 21 Dec 2013 16:19:30 -0500
> From: Richard Stallman <address@hidden>
> 
> I tried to commit a documentation change in simple.el and lisp/ChangeLog.
> I got an error message saying there are conflicts.  (There are no conficts
> in those files.)
> 
> bzr conflicts gave me this output.
> 
> ======================================================================
> Conflict: can't delete info because it is not empty.  Not deleting.
> Conflict adding file lisp/dired.el.BASE.  Moved existing file to 
> lisp/dired.el.BASE.moved.
> Conflict adding file lisp/dired.el.OTHER.  Moved existing file to 
> lisp/dired.el.OTHER.moved.
> Conflict adding file lisp/dired.el.THIS.  Moved existing file to 
> lisp/dired.el.THIS.moved.
> ======================================================================
> 
> I don't understand any of this.  What do I have to do?

Delete the directory info with all that's in there, and then try

  bzr resolve --all --take-other

If this succeeds, the next "bzr conflicts" command should produce no
output.

> And why is any of this relevant to the change I want to commit?

Because your local repository is not up to date, and bzr won't let you
commit from an outdated repository.