From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bill Wohler Newsgroups: gmane.emacs.devel Subject: Re: How to resolve: Conflicting tags: mh-e-8.4 Date: Mon, 21 Jan 2013 11:58:56 -0800 Organization: Newt Software Message-ID: <87zk02fgu7.fsf@olgas.newt.com> References: <7bhamjwv8i.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1358798364 10309 80.91.229.3 (21 Jan 2013 19:59:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Jan 2013 19:59:24 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 21 20:59:43 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TxNWw-0000FG-Dw for ged-emacs-devel@m.gmane.org; Mon, 21 Jan 2013 20:59:42 +0100 Original-Received: from localhost ([::1]:56493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxNWf-0002Of-Gj for ged-emacs-devel@m.gmane.org; Mon, 21 Jan 2013 14:59:25 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:52878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxNWa-0002NM-1u for emacs-devel@gnu.org; Mon, 21 Jan 2013 14:59:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxNWT-0006At-RG for emacs-devel@gnu.org; Mon, 21 Jan 2013 14:59:19 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:58121) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxNWT-0006Ag-9g for emacs-devel@gnu.org; Mon, 21 Jan 2013 14:59:13 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TxNWf-00008k-UM for emacs-devel@gnu.org; Mon, 21 Jan 2013 20:59:25 +0100 Original-Received: from c-24-6-50-153.hsd1.ca.comcast.net ([24.6.50.153]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 21 Jan 2013 20:59:25 +0100 Original-Received: from wohler by c-24-6-50-153.hsd1.ca.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 21 Jan 2013 20:59:25 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 25 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-24-6-50-153.hsd1.ca.comcast.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) Cancel-Lock: sha1:FwXR+jNLNZRHrM0tSSYjcnGqIvk= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:156558 Archived-At: Glenn Morris writes: > Leo Liu wrote: > >> When I push a commit to trunk, I am seeing this odd alarming message: >> Conflicting tags: mh-e-8.4 >> >> How can I get rid of it? Thanks. > > Pretty sure I've explained this at least twice on this list. Eg > > http://lists.gnu.org/archive/html/emacs-devel/2011-09/msg00490.html In that email you mention that you haven't seen this with bound, authenticated branches. This does seem like a deficiency of Bazaar in that you have to align the planets to avoid this problem. When I push an unbound branch with a new tag, the Right Thing Should Happen. Regardless, I'll make sure that I'm operating on a bound branch of trunk next time I tag. I apologize for the trouble. -- Bill Wohler aka http://www.newt.com/wohler/ GnuPG ID:610BD9AD