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: Strange message from "bzr pull" Date: Wed, 30 Dec 2009 00:32:56 +0100 Message-ID: <871vidnyon.fsf@telefonica.net> References: <877hs5ogv8.fsf@red-bean.com> <83my11ejmr.fsf@gnu.org> <83ljgleiir.fsf@gnu.org> <87y6klo9zz.fsf@telefonica.net> <87637plftj.fsf@red-bean.com> <87iqbpo8bp.fsf@telefonica.net> <838wcled7s.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1262129625 24495 80.91.229.12 (29 Dec 2009 23:33:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 29 Dec 2009 23:33:45 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 30 00:33:38 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NPlZK-0005wR-1L for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 00:33:38 +0100 Original-Received: from localhost ([127.0.0.1]:54011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NPlZK-0005ni-FQ for ged-emacs-devel@m.gmane.org; Tue, 29 Dec 2009 18:33:38 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NPlZF-0005nL-9r for emacs-devel@gnu.org; Tue, 29 Dec 2009 18:33:33 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NPlZ9-0005mt-Er for emacs-devel@gnu.org; Tue, 29 Dec 2009 18:33:31 -0500 Original-Received: from [199.232.76.173] (port=41025 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NPlZ9-0005mi-9p for emacs-devel@gnu.org; Tue, 29 Dec 2009 18:33:27 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:38121) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NPlZ9-0001HX-15 for emacs-devel@gnu.org; Tue, 29 Dec 2009 18:33:27 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NPlZ2-0005qW-0g for emacs-devel@gnu.org; Wed, 30 Dec 2009 00:33:20 +0100 Original-Received: from 234.red-81-33-96.dynamicip.rima-tde.net ([81.33.96.234]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 30 Dec 2009 00:33:20 +0100 Original-Received: from ofv by 234.red-81-33-96.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 30 Dec 2009 00:33:20 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 51 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 234.red-81-33-96.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) Cancel-Lock: sha1:mWTtldsPElTVExyXs5QAk9W9ljo= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:118995 Archived-At: Eli Zaretskii writes: [snip] >> Nobody that reads that document knows that the key information that >> makes DVCS possible is what you see with >> >> bzr log --show-ids > > And why is that information important? Distributed version control is about exchanging revisions. You need a way to know what revisions you are missing from some other branch, and a way to know how the revisions are arranged. Those unique revision-ids are the solution. A branch is, essentially, a set of revisions arranged on a DAG. As far as Bazaar is concerned, the revision-id of a revision (and the revision-ids of its parents) is the interesting info. The revision number (revno) is only meaningful for a given branch or a mirror of it. Some tools, like git, do not try to use revision numbers and use the revision-id instead. This is the Right Thing but too much people think that those long unique ids are too cumbersome, so Bazaar and Mercurial have revision numbers too. Hence, when someone says "revision 98834 broke the build" he must take care of referring to the master trunk, and you shall look at that revision number on your local mirror of trunk, because other branches may have different numeration. But if you say "revision ofv@wanadoo.es-20091229071534-bdspozxb6idtp7z0 broke the build" you can see the changes it introduced on any branch with bzr diff -c revid:ofv@wanadoo.es-20091229071534-bdspozxb6idtp7z0 > More to the point, where _is_ it described? No idea. But the above description should suffice for our purposes. > What I see is this: > > revno: 99212 [merge] > revision-id: nickrob@snap.net.nz-20091229072200-2capgobhol086ef3 > parent: dann@ics.uci.edu-20091229064608-lpeenthwsy3zp0vy > parent: nickrob@snap.net.nz-20091229071534-bdspozxb6idtp7z0 This revision has two parents because it is a merge point. I'm sure you get the idea. [snip] -- Óscar