Re: Merge conflict cookie in dired.el (current HEAD in bzr)

[Eli Zaretskii]

> From: Bastien <address@hidden>
> Date: Fri, 28 Sep 2012 00:56:50 +0200
> Cc: address@hidden
> 
> Glenn Morris <address@hidden> writes:
> 
> > Bastien wrote:
> >
> >> There is this merge conflict indication in dired.el
> >> which prevents Emacs from building:
> >
> > That is local to your copy.
> 
> Indeed.  No idea how this ended up here.

Probably like this:

  . "bzr up"
  . build Emacs, which changed dired.el due to autoloads
  . "bzr up", which brought in dired.el where the same autoloads were
    already updated, but the time stamp was different.  Bzr told you
    that there text conflicts, but you didn't notice that.

In general, it is advisable to run "bzr st" from time to time,
preferably after the build that you do after "bzr up", to see if any
versioned files changed due to autoloads.  If some of them did, either
commit those files (preferred), or "bzr revert" and rebuild, then wait
for someone else to commit the modified autoloads.