From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ken Brown Newsgroups: gmane.emacs.devel Subject: Re: bzr: conflicting tags: mh-e-doc-8.3 Date: Wed, 21 Sep 2011 10:40:51 -0400 Message-ID: <4E79F773.8010005@cornell.edu> References: <75k49315wb.fsf@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1316616073 20304 80.91.229.12 (21 Sep 2011 14:41:13 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 21 Sep 2011 14:41:13 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Sep 21 16:41:10 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 1R6Nz3-0006VK-TD for ged-emacs-devel@m.gmane.org; Wed, 21 Sep 2011 16:41:10 +0200 Original-Received: from localhost ([::1]:47746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6Nz3-0005O3-Ep for ged-emacs-devel@m.gmane.org; Wed, 21 Sep 2011 10:41:09 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:44565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6Nyv-0005Nx-RF for emacs-devel@gnu.org; Wed, 21 Sep 2011 10:41:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6Nyr-00022D-VN for emacs-devel@gnu.org; Wed, 21 Sep 2011 10:41:01 -0400 Original-Received: from granite1.mail.cornell.edu ([128.253.83.141]:59417 helo=authusersmtp.mail.cornell.edu) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6Nyr-00021s-P3; Wed, 21 Sep 2011 10:40:57 -0400 Original-Received: from [128.84.234.246] (dhcp246.math.cornell.edu [128.84.234.246]) (authenticated bits=0) by authusersmtp.mail.cornell.edu (8.14.4/8.12.10) with ESMTP id p8LEep04026605 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 21 Sep 2011 10:40:51 -0400 (EDT) User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:6.0.1) Gecko/20110830 Thunderbird/6.0.1 In-Reply-To: <75k49315wb.fsf@fencepost.gnu.org> X-detected-operating-system: by eggs.gnu.org: Solaris 9 X-Received-From: 128.253.83.141 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:144152 Archived-At: 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