From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Release tags Date: Wed, 05 Sep 2012 17:33:01 +0200 Message-ID: <87vcfsjxhu.fsf@wanadoo.es> References: <04A8931A-A044-4F8A-86FD-7AA70DA2B5E3@mit.edu> <87d32awhc7.fsf@gnu.org> <87wr0aldw0.fsf@gmail.com> <83pq62ec1i.fsf@gnu.org> <87fw6x505b.fsf@gnu.org> <87mx15lr1k.fsf@wanadoo.es> <87y5kpydsr.fsf@gnu.org> <87r4qga58n.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1346859205 13000 80.91.229.3 (5 Sep 2012 15:33:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 5 Sep 2012 15:33:25 +0000 (UTC) Cc: emacs-devel@gnu.org, Jason Rumney To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Sep 05 17:33:27 2012 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 1T9HbZ-00054Q-1g for ged-emacs-devel@m.gmane.org; Wed, 05 Sep 2012 17:33:25 +0200 Original-Received: from localhost ([::1]:39470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9HbW-0005gZ-4N for ged-emacs-devel@m.gmane.org; Wed, 05 Sep 2012 11:33:22 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:53437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9HbO-0005fX-83 for emacs-devel@gnu.org; Wed, 05 Sep 2012 11:33:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T9HbI-0002pg-HC for emacs-devel@gnu.org; Wed, 05 Sep 2012 11:33:14 -0400 Original-Received: from impaqm1.telefonica.net ([213.4.138.17]:33993 helo=telefonica.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9HbI-0002pC-6w for emacs-devel@gnu.org; Wed, 05 Sep 2012 11:33:08 -0400 Original-Received: from IMPmailhost1.adm.correo ([10.20.102.38]) by IMPaqm1.telefonica.net with bizsmtp id vHAq1j00L0piX6q3MTZ6NW; Wed, 05 Sep 2012 17:33:06 +0200 Original-Received: from qcore ([79.147.14.108]) by IMPmailhost1.adm.correo with BIZ IMP id vTZ21j00T2Kt1p31hTZ2nq; Wed, 05 Sep 2012 17:33:03 +0200 X-Brightmail-Tracker: AAAAAA== X-original-sender: 981711563@telefonica.net In-Reply-To: (Andreas Schwab's message of "Wed, 05 Sep 2012 17:18:08 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 213.4.138.17 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:153051 Archived-At: Andreas Schwab writes: > Jason Rumney writes: > >> Except when you merge that revision onto another branch, some here >> seemed to be saying the tag would be merged with it, which makes no >> sense to me, because after the merge what gets checked in should be a >> different revision > > No, the merged revisions don't change. Jason, try executing `bzr qlog' from your trunk branch checkout and click on the small circles that contains a + symbol (those are merge revisions.) You will see that a merge revision joins a series of revisions from the original branch (trunk, in this case) with a series of revisions coming from another branch. All revisions are there.