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

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

[Glenn Morris]

If your bzr update/pull exits with:

Conflicting tags:
    mh-e-doc-8.3

and a non-zero status, then it seems like you can fix it by running:

bzr tag --force -r \
  'revid:wohler@newt.com-20110920045651-kxtr7wac2xzct0sn' mh-e-doc-8.3

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

[Eli Zaretskii]

> From: Glenn Morris <rgm@gnu.org>
> Date: Tue, 20 Sep 2011 13:27:00 -0400
> 
> 
> If your bzr update/pull exits with:
> 
> Conflicting tags:
>     mh-e-doc-8.3

FWIW, I didn't have any such conflicts when I updated an hour or so
ago.

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

[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.

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

[Andreas Röhler]

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

First update of that repo build

bzr branch lp:emacs

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

[Eli Zaretskii]

> Date: Wed, 21 Sep 2011 08:32:43 +0200
> From: Andreas Röhler <andreas.roehler@online.de>
> 
> 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.

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

[Eli Zaretskii]

> Date: Wed, 21 Sep 2011 03:10:37 -0400
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org
> 
> > Date: Wed, 21 Sep 2011 08:32:43 +0200
> > From: Andreas Röhler <andreas.roehler@online.de>
> > 
> > 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.

Actually, running "bzr tags", I see only one version which has this
tag: 105851.

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

[Ken Brown]

On 9/20/2011 1:27 PM, Glenn Morris wrote:
>
> If your bzr update/pull exits with:
>
> Conflicting tags:
>      mh-e-doc-8.3
>
> and a non-zero status, then it seems like you can fix it by running:
>
> bzr tag --force -r \
>    'revid:wohler@newt.com-20110920045651-kxtr7wac2xzct0sn' mh-e-doc-8.3

That worked, but now I'm getting

Conflicting tags:
     mh-e-8.3

after a bzr pull.  Can you tell me how to fix that one?

Ken

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

[Eli Zaretskii]

> Date: Wed, 21 Sep 2011 10:40:51 -0400
> From: Ken Brown <kbrown@cornell.edu>
> Cc: emacs-devel@gnu.org
> 
> > bzr tag --force -r \
> >    'revid:wohler@newt.com-20110920045651-kxtr7wac2xzct0sn' mh-e-doc-8.3
> 
> That worked, but now I'm getting
> 
> Conflicting tags:
>      mh-e-8.3
> 
> after a bzr pull.  Can you tell me how to fix that one?

Who said it's a problem that needs fixing?  Do you see any errors from
bzr in any commands you use?

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

[Ken Brown]

On 9/21/2011 10:56 AM, Eli Zaretskii wrote:
>> Date: Wed, 21 Sep 2011 10:40:51 -0400
>> From: Ken Brown<kbrown@cornell.edu>
>> Cc: emacs-devel@gnu.org
>>
>>> bzr tag --force -r \
>>>     'revid:wohler@newt.com-20110920045651-kxtr7wac2xzct0sn' mh-e-doc-8.3
>>
>> That worked, but now I'm getting
>>
>> Conflicting tags:
>>       mh-e-8.3
>>
>> after a bzr pull.  Can you tell me how to fix that one?
>
> Who said it's a problem that needs fixing?  Do you see any errors from
> bzr in any commands you use?

Well, there's the "Conflicting tags" error, which is repeated after 
every pull.  It's just a minor annoyance, and I can ignore it.  Still, 
if Glenn knows how to get rid of the error message, I'd like to do it.

Ken

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

[Eli Zaretskii]

> Date: Wed, 21 Sep 2011 11:05:57 -0400
> From: Ken Brown <kbrown@cornell.edu>
> Cc: emacs-devel@gnu.org
> 
> >> That worked, but now I'm getting
> >>
> >> Conflicting tags:
> >>       mh-e-8.3
> >>
> >> after a bzr pull.  Can you tell me how to fix that one?
> >
> > Who said it's a problem that needs fixing?  Do you see any errors from
> > bzr in any commands you use?
> 
> Well, there's the "Conflicting tags" error

It's not an error.  It isn't even in the log file.

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

[Andy Moreton]

On Wed 21 Sep 2011, Eli Zaretskii wrote:

>> Date: Wed, 21 Sep 2011 11:05:57 -0400
>> From: Ken Brown <kbrown@cornell.edu>
>> Cc: emacs-devel@gnu.org
>> 
>> >> That worked, but now I'm getting
>> >>
>> >> Conflicting tags:
>> >>       mh-e-8.3
>> >>
>> >> after a bzr pull.  Can you tell me how to fix that one?
>> >
>> > Who said it's a problem that needs fixing?  Do you see any errors from
>> > bzr in any commands you use?
>> 
>> Well, there's the "Conflicting tags" error
>
> It's not an error.  It isn't even in the log file.

If it's not an error, why does bzr complain every time then ?

Either it is reporting a problem with the repository that requires
attention from the user, or it is a bug in bzr that neees fixing.

    AndyM

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

[Eli Zaretskii]

> From: Andy Moreton <andrewjmoreton@gmail.com>
> Date: Thu, 22 Sep 2011 10:14:54 +0100
> 
> > It's not an error.  It isn't even in the log file.
> 
> If it's not an error, why does bzr complain every time then ?

I don't know.  I meant "no error" in the sense that this doesn't
prevent bzr from doing what you asked it to.

> Either it is reporting a problem with the repository that requires
> attention from the user, or it is a bug in bzr that neees fixing.

You are encouraged to report this to the bzr bug tracker.

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

[Andreas Schwab]

Ken Brown <kbrown@cornell.edu> writes:

> That worked, but now I'm getting
>
> Conflicting tags:
>     mh-e-8.3
>
> after a bzr pull.  Can you tell me how to fix that one?

Just delete it.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

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

[Glenn Morris]

Ken Brown wrote:

> Conflicting tags:
>     mh-e-8.3
>
> after a bzr pull.  Can you tell me how to fix that one?

Me too. These mh-e tags seem to be a movable feast.
Now they are attached to r105864:
http://lists.gnu.org/archive/html/emacs-diffs/2011-09/msg00250.html

FWIW, I do not see this issue with a bound, authenticated branch, but I
do see it with an unbound, anonymous branch. It's an annoyance because
you get the conflict message after every subsequent pull, and pull exits
with non-zero status.

Anyway, to fix it I just followed the advice at

http://doc.bazaar.canonical.com/latest/en/user-reference/conflict-types-help.html

If you have no local changes, use

bzr pull --overwrite

once. If you have local changes, you can do:

bzr tags --show-ids -d bzr://bzr.savannah.gnu.org/emacs/trunk | grep mh-e-8.3

Take the revid that returns and use:

bzr tag --force -r 'revid:wohler@newt.com-20110921052217-v8u5kqkpl62l6ilz' \
  mh-e-8.3

This makes bzr pull happy, but leaves me with these tags:

mh-e-8.3             105864
mh-e-doc-8.3         105851

when http://lists.gnu.org/archive/html/emacs-diffs/2011-09/msg00250.html
implies they should both be associated with r105864. (The overwrite
method has the same issue.)

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

[Bill Wohler]

My apologies everyone. I had no idea that deleting a tag and recreating
it would have this affect.

Fortunately, I've released MH-E 8.3 so the tags mh-e-8.3 and
mh-e-doc-8.3 shouldn't change any more :-). I'll also be more careful
next time to create the tag only once.

This does seem like a bug in bzr though. The pull should update your
local copy of the tag, shouldn't it?

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD

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

[Glenn Morris]

Bill Wohler wrote:

> I had no idea that deleting a tag and recreating it would have this
> affect.

How did you do it? Did you use bzr tag --force the second time, or
something else?

> This does seem like a bug in bzr though. The pull should update your
> local copy of the tag, shouldn't it?

I think it is probably an existing bzr bug (lack of versioned tags?),
but don't worry, I will make a report.

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

[Bill Wohler]

Glenn Morris <rgm@gnu.org> writes:

> Bill Wohler wrote:
>
>> I had no idea that deleting a tag and recreating it would have this
>> affect.
>
> How did you do it? Did you use bzr tag --force the second time, or
> something else?

No, bzr tag --delete <tag>; bzr tag <tag>

>> This does seem like a bug in bzr though. The pull should update your
>> local copy of the tag, shouldn't it?
>
> I think it is probably an existing bzr bug (lack of versioned tags?),
> but don't worry, I will make a report.

Thank you.

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD

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

[Glenn Morris]

Glenn Morris wrote:

> I think it is probably an existing bzr bug (lack of versioned tags?),
> but don't worry, I will make a report.

As expected, it's the lack of versioned tags:

https://bugs.launchpad.net/bzr/+bug/856597

We may get "pull --overwrite-tags" in future to make life easier.

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

[Andreas Schwab]

Bill Wohler <wohler@newt.com> writes:

> Fortunately, I've released MH-E 8.3 so the tags mh-e-8.3 and
> mh-e-doc-8.3 shouldn't change any more :-). I'll also be more careful
> next time to create the tag only once.

mh-e-8.3 is wohler@newt.com-20110921052217-v8u5kqkpl62l6ilz and
mh-e-doc-8.3 is wohler@newt.com-20110920045651-kxtr7wac2xzct0sn.  Why
not the other way round?

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

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

[Bill Wohler]

Andreas Schwab <schwab@linux-m68k.org> writes:

> Bill Wohler <wohler@newt.com> writes:
>
>> Fortunately, I've released MH-E 8.3 so the tags mh-e-8.3 and
>> mh-e-doc-8.3 shouldn't change any more :-). I'll also be more careful
>> next time to create the tag only once.
>
> mh-e-8.3 is wohler@newt.com-20110921052217-v8u5kqkpl62l6ilz and
> mh-e-doc-8.3 is wohler@newt.com-20110920045651-kxtr7wac2xzct0sn.  Why
> not the other way round?

Because that is in the order in which I created the tags. Is this
important?

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD

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

[Andreas Schwab]

Bill Wohler <wohler@newt.com> writes:

> Andreas Schwab <schwab@linux-m68k.org> writes:
>
>> Bill Wohler <wohler@newt.com> writes:
>>
>>> Fortunately, I've released MH-E 8.3 so the tags mh-e-8.3 and
>>> mh-e-doc-8.3 shouldn't change any more :-). I'll also be more careful
>>> next time to create the tag only once.
>>
>> mh-e-8.3 is wohler@newt.com-20110921052217-v8u5kqkpl62l6ilz and
>> mh-e-doc-8.3 is wohler@newt.com-20110920045651-kxtr7wac2xzct0sn.  Why
>> not the other way round?
>
> Because that is in the order in which I created the tags. Is this
> important?

What has wohler@newt.com-20110920045651-kxtr7wac2xzct0sn to do with
mh-e-doc-8.3?

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

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

[Bill Wohler]

Andreas Schwab <schwab@linux-m68k.org> writes:

> Bill Wohler <wohler@newt.com> writes:
>
>> Andreas Schwab <schwab@linux-m68k.org> writes:
>>
>>> Bill Wohler <wohler@newt.com> writes:
>>>
>>>> Fortunately, I've released MH-E 8.3 so the tags mh-e-8.3 and
>>>> mh-e-doc-8.3 shouldn't change any more :-). I'll also be more careful
>>>> next time to create the tag only once.
>>>
>>> mh-e-8.3 is wohler@newt.com-20110921052217-v8u5kqkpl62l6ilz and
>>> mh-e-doc-8.3 is wohler@newt.com-20110920045651-kxtr7wac2xzct0sn.  Why
>>> not the other way round?
>>
>> Because that is in the order in which I created the tags. Is this
>> important?
>
> What has wohler@newt.com-20110920045651-kxtr7wac2xzct0sn to do with
> mh-e-doc-8.3?

Sorry, I don't know what you mean. bzr tags | grep "mh-e.*8.3" shows:

    mh-e-8.3             105864
    mh-e-doc-8.3         105864

which is what I would expect.

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD

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

[Andreas Schwab]

Bill Wohler <wohler@newt.com> writes:

> Sorry, I don't know what you mean. bzr tags | grep "mh-e.*8.3" shows:
>
>     mh-e-8.3             105864
>     mh-e-doc-8.3         105864
>
> which is what I would expect.

That's not what's on savannah.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

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

[Bill Wohler]

Andreas Schwab <schwab@linux-m68k.org> wrote:

> Bill Wohler <wohler@newt.com> writes:
> 
> > Sorry, I don't know what you mean. bzr tags | grep "mh-e.*8.3" shows:
> >
> >     mh-e-8.3             105864
> >     mh-e-doc-8.3         105864
> >
> > which is what I would expect.
> 
> That's not what's on savannah.

Color me confused. I have a bound branch so I'd expect that what I have
is the same as what's on savannah. I'm still green with Bazaar so I'll
RTFM....

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD