Re: bzr: conflicting tags: mh-e-doc-8.3

[Eli Zaretskii]

> Date: Wed, 21 Sep 2011 08:32:43 +0200
> From: Andreas Röhler <address@hidden>
> 
> Am 20.09.2011 19:57, schrieb Glenn Morris:
> > Eli Zaretskii wrote:
> >
> >> FWIW, I didn't have any such conflicts when I updated an hour or so
> >> ago.
> >
> > Maybe I did something to end up in this state, I don't know.
> > I've just been bzr pulling every day.
> > For me, r104749 and r105851 both had a tag "mh-e-doc-8.3".
> >
> > http://lists.gnu.org/archive/html/emacs-diffs/2011-06/msg00311.html
> >   does not show a "tags" entry though.
> > http://lists.gnu.org/archive/html/emacs-diffs/2011-09/msg00237.html
> >   does.
> >
> >
> 
> get this error this morning doing
> 
> bzr pull

Maybe it's a pull vs update thing.