From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: bzr: conflicting tags: mh-e-doc-8.3 Date: Wed, 21 Sep 2011 13:37:08 -0400 Message-ID: <8ety85er0b.fsf@fencepost.gnu.org> References: <75k49315wb.fsf@fencepost.gnu.org> <4E79F773.8010005@cornell.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1316626644 4430 80.91.229.12 (21 Sep 2011 17:37:24 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 21 Sep 2011 17:37:24 +0000 (UTC) Cc: emacs-devel@gnu.org To: Ken Brown Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Sep 21 19:37:19 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1R6QjS-0002w8-Uj for ged-emacs-devel@m.gmane.org; Wed, 21 Sep 2011 19:37:15 +0200 Original-Received: from localhost ([::1]:60077 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6QjS-0002HB-Ce for ged-emacs-devel@m.gmane.org; Wed, 21 Sep 2011 13:37:14 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:38124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6QjQ-0002H6-55 for emacs-devel@gnu.org; Wed, 21 Sep 2011 13:37:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6QjO-0007Gi-M3 for emacs-devel@gnu.org; Wed, 21 Sep 2011 13:37:12 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:55564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6QjO-0007Gc-J4 for emacs-devel@gnu.org; Wed, 21 Sep 2011 13:37:10 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1R6QjN-0005gP-3M; Wed, 21 Sep 2011 13:37:09 -0400 X-Spook: halcon Medco kilderkin Panama ASLET DES Serbian emc X-Ran: gI%sKI},?)5CLxf'sL6m}ZoWT*GI2G1H{|4s$/5$GSZb?dVT!d>F)6<(GRWm>F^GMsf.o- X-Hue: white X-Attribution: GM In-Reply-To: <4E79F773.8010005@cornell.edu> (Ken Brown's message of "Wed, 21 Sep 2011 10:40:51 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.10 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:144167 Archived-At: 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.)