From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Carl Worth Subject: Re: VCS comparison table Date: Wed, 25 Oct 2006 08:54:42 -0700 Message-ID: <87slhcz8zh.wl%cworth@cworth.org> References: <45357CC3.4040507@utoronto.ca> <20061021130111.GL75501@over-yonder.net> <453F2FF8.2080903@op5.se> <200610251146.06116.jnareb@gmail.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/signed; boundary="pgp-sign-Multipart_Wed_Oct_25_08:54:36_2006-1"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit NNTP-Posting-Date: Wed, 25 Oct 2006 15:55:11 +0000 (UTC) Cc: "Jakub Narebski" , "Andreas Ericsson" , bazaar-ng@lists.canonical.com, "Matthew D. Fuller" , "Linus Torvalds" , git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org In-Reply-To: User-Agent: Wanderlust/2.14.0 (Africa) Emacs/21.4 Mule/5.0 (SAKAKI) Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Gcl5j-0002Xa-FP for gcvg-git@gmane.org; Wed, 25 Oct 2006 17:54:55 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932432AbWJYPyw (ORCPT ); Wed, 25 Oct 2006 11:54:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932260AbWJYPyw (ORCPT ); Wed, 25 Oct 2006 11:54:52 -0400 Received: from theworths.org ([217.160.253.102]:33754 "EHLO theworths.org") by vger.kernel.org with ESMTP id S932432AbWJYPyv (ORCPT ); Wed, 25 Oct 2006 11:54:51 -0400 Received: (qmail 24385 invoked from network); 25 Oct 2006 11:54:44 -0400 Received: from localhost (HELO raht.cworth.org) (127.0.0.1) by localhost with SMTP; 25 Oct 2006 11:54:44 -0400 To: "James Henstridge" Sender: git-owner@vger.kernel.org --pgp-sign-Multipart_Wed_Oct_25_08:54:36_2006-1 Content-Type: text/plain; charset=US-ASCII On Wed, 25 Oct 2006 18:08:22 +0800, "James Henstridge" wrote: > If there aren't, or you made the merge by mistake, you can make a call > to "bzr revert" to clean things up without ever having created a new > revision. One result of this approach is that developers of different trees don't necessarily have common revision IDs to compare. Imagine a question like: When you ran that test did you have the same code I've got? In git, the answer would be determined by comparing revision IDs. In bzr, the only answer I'm hearing is attempting a merge to see if it introduces any changes. (I'm deliberately avoiding "pull" since we're talking about distributed cases here). And to comment on something mentioned earlier in the thread, there's no need for "wildly complex" distributed scenarios. All of these issues are present with developers working together as peers, (and each considering their own repository as canonical). A harder question (for bzr) is: Do you have all of the history I've got? (The problem being that when one developer is missing some history and merges it in, she necessarily creates new history, so there's never a stable point for both sides to agree on.) -Carl --pgp-sign-Multipart_Wed_Oct_25_08:54:36_2006-1 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQBFP4jC6JDdNq8qSWgRAqUYAJwMH/rsXMjg0NUIQbbGgS+s4AkU4ACdEC/2 aQa5hnT5vrhhKd7joyqabi0= =auOZ -----END PGP SIGNATURE-----