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: "Matthew D. Fuller" Subject: Re: VCS comparison table Date: Thu, 26 Oct 2006 07:12:53 -0500 Message-ID: <20061026121253.GE17019@over-yonder.net> References: <20061023222131.GB17019@over-yonder.net> <20061024002622.GC17019@over-yonder.net> <20061024163458.GH17019@over-yonder.net> <20061025002713.GN17019@over-yonder.net> <20061025235306.GD17019@over-yonder.net> <45408A53.10400@op5.se> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii NNTP-Posting-Date: Thu, 26 Oct 2006 12:13:31 +0000 (UTC) Cc: David Lang , bazaar-ng@lists.canonical.com, git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org Content-Disposition: inline In-Reply-To: <45408A53.10400@op5.se> X-Editor: vi X-OS: FreeBSD User-Agent: Mutt/1.5.11-fullermd.3 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 1Gd46V-000386-TL for gcvg-git@gmane.org; Thu, 26 Oct 2006 14:13:00 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423299AbWJZMM4 (ORCPT ); Thu, 26 Oct 2006 08:12:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1423352AbWJZMM4 (ORCPT ); Thu, 26 Oct 2006 08:12:56 -0400 Received: from ns.centralmiss.com ([206.156.254.79]:61950 "EHLO optimus.centralmiss.com") by vger.kernel.org with ESMTP id S1423299AbWJZMMz (ORCPT ); Thu, 26 Oct 2006 08:12:55 -0400 Received: from draco.over-yonder.net (adsl-072-148-013-213.sip.jan.bellsouth.net [72.148.13.213]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by optimus.centralmiss.com (Postfix) with ESMTP id 455212842A; Thu, 26 Oct 2006 07:12:54 -0500 (CDT) Received: by draco.over-yonder.net (Postfix, from userid 100) id CD06C61C5E; Thu, 26 Oct 2006 07:12:53 -0500 (CDT) To: Andreas Ericsson Sender: git-owner@vger.kernel.org On Thu, Oct 26, 2006 at 12:13:39PM +0200 I heard the voice of Andreas Ericsson, and lo! it spake thus: > Matthew D. Fuller wrote: > > > >In git, this is a non-issue because you don't get to CHOOSE which > >way to work. > > Yes they do. Not where I was going with that section of the mail; I was looking at just the merge vs fast-forward distinction. In git, you don't get to choose; in bzr you do. -- Matthew Fuller (MF4839) | fullermd@over-yonder.net Systems/Network Administrator | http://www.over-yonder.net/~fullermd/