From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 594 invoked by alias); 14 Oct 2011 14:09:16 -0000 Received: (qmail 574 invoked by uid 22791); 14 Oct 2011 14:09:15 -0000 X-SWARE-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,TW_BZ X-Spam-Check-By: sourceware.org Received: from stl-smtpout-01.boeing.com (HELO stl-smtpout-01.boeing.com) (130.76.96.56) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 14 Oct 2011 14:08:49 +0000 Received: from blv-av-01.boeing.com (blv-av-01.boeing.com [130.247.48.231]) by stl-smtpout-01.ns.cs.boeing.com (8.14.4/8.14.4/8.14.4/SMTPOUT) with ESMTP id p9EE8dGw019636 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 14 Oct 2011 09:08:40 -0500 (CDT) Received: from blv-av-01.boeing.com (localhost [127.0.0.1]) by blv-av-01.boeing.com (8.14.4/8.14.4/DOWNSTREAM_RELAY) with ESMTP id p9EE8d7q010552; Fri, 14 Oct 2011 07:08:39 -0700 (PDT) Received: from XCH-SWHT-03.sw.nos.boeing.com (xch-swht-03.sw.nos.boeing.com [129.172.160.44]) by blv-av-01.boeing.com (8.14.4/8.14.4/UPSTREAM_RELAY) with ESMTP id p9EE8cLV010537 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=OK); Fri, 14 Oct 2011 07:08:39 -0700 (PDT) Received: from XCH-SW-04V.sw.nos.boeing.com ([129.172.197.27]) by XCH-SWHT-03.sw.nos.boeing.com ([129.172.160.44]) with mapi; Fri, 14 Oct 2011 07:08:39 -0700 From: "Li, Rongsheng" To: Eli Zaretskii , Mark Kettenis CC: "pmuldoon@redhat.com" , "gdb@sourceware.org" Date: Fri, 14 Oct 2011 14:09:00 -0000 Subject: RE: GIT and CVS Message-ID: <1427CD9B0AAD5F41B342DC0F53EFD42CC6D827DB67@XCH-SW-04V.sw.nos.boeing.com> References: <83r52g1rly.fsf@gnu.org> <83hb3ckn2s.fsf@gnu.org> <201110141022.p9EAMrUN030848@glazunov.sibelius.xs4all.nl> <83aa93lu58.fsf@gnu.org> In-Reply-To: <83aa93lu58.fsf@gnu.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org X-SW-Source: 2011-10/txt/msg00120.txt.bz2 Anyone remember how to unbscribe this ? Thanks Ken=20 -----Original Message----- From: gdb-owner@sourceware.org [mailto:gdb-owner@sourceware.org] On Behalf = Of Eli Zaretskii Sent: Friday, October 14, 2011 3:56 AM To: Mark Kettenis Cc: pmuldoon@redhat.com; gdb@sourceware.org Subject: Re: GIT and CVS > Date: Fri, 14 Oct 2011 12:22:53 +0200 (CEST) > From: Mark Kettenis > CC: pmuldoon@redhat.com, gdb@sourceware.org >=20 > $ cvs update > (make some changes) > ... > (come back a couple of days later) > $ cvs update > (merge conflicts, make some more changes) ... > $ cvs update > (test changes, write changelog, send diff for review) ... > $ cvs update > (test changes again, fixup changelog) > $ cvs commit > [...] > How does bzr compare here? Is it close enough to CVS that there is a > 1:1 mapping of commands with perhaps an additional command to "push" > changes upstream? Yes. With bzr, you can "bind" your local branch to the upstream repository= , which then makes the workflow in that branch very similar to what you hav= e in CVS. E.g., your workflow above will be literally the same, except tha= t "cvs" should be replaced with "bzr" (bzr has an "update" command, which i= n a bound branch behaves exactly like "cvs up"), and merge conflicts are ex= tremely rare, because bzr is much smarter about merges (as are git and Merc= urial). There isn't even the need to use "bzr push", because in a bound br= anch "bzr commit" will automatically commit locally and push upstream withi= n the same transaction. You don't need to commit unfinished work, because "bzr up" in a bound branc= h automatically merges the changes from upstream with your local changes. So you retain your CVS-like workflow, and in addition get all the benefits = of a dVCS: cheap branching, smart merges, possibility of local commits (if = you are off line), possibility of temporarily "shelving" changes aside and = returning to them later, etc. But you use all these beneficial features if= you want to, you aren't forced to do it. Bzr on GNU/Linux is slower than git (any VCS is slower than git on GNU/Linu= x), but I find it fast enough to not be an annoyance in day-to-day work.