From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15265 invoked by alias); 14 Oct 2011 14:52:02 -0000 Received: (qmail 15249 invoked by uid 22791); 14 Oct 2011 14:52:00 -0000 X-SWARE-Spam-Status: No, hits=-6.7 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS,TW_BZ X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 14 Oct 2011 14:51:44 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9EEpgLt014276 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 14 Oct 2011 10:51:42 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9EEpePf015139; Fri, 14 Oct 2011 10:51:41 -0400 From: Phil Muldoon To: Mark Kettenis Cc: eliz@gnu.org, gdb@sourceware.org Subject: Re: GIT and CVS References: <83r52g1rly.fsf@gnu.org> <83hb3ckn2s.fsf@gnu.org> <201110141022.p9EAMrUN030848@glazunov.sibelius.xs4all.nl> Reply-to: pmuldoon@redhat.com X-URL: http://www.redhat.com Date: Fri, 14 Oct 2011 14:52:00 -0000 In-Reply-To: <201110141022.p9EAMrUN030848@glazunov.sibelius.xs4all.nl> (Mark Kettenis's message of "Fri, 14 Oct 2011 12:22:53 +0200 (CEST)") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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/msg00125.txt.bz2 Mark Kettenis writes: >> Date: Fri, 14 Oct 2011 10:13:31 +0200 >> From: Eli Zaretskii >> >> > > If we are going to switch to a dVCS, git is not the only choice. I >> > > like bzr better; bzr is a GNU project, unlike git. >> > >> > Given your question above, does bzr fulfill the roles any better than >> > GIT? >> >> Yes, definitely. For starters, it works on Posix and Windows >> platforms alike. Emacs uses bzr as its VCS for the last 2 years or >> so. > > I'm a git hater. And the reason I hate GIT is because of the > development model it enforces. It doesn't match the way I work. My > workflow looks more or less as follows: > > $ cvs update > (make some changes) git pull will fetch and merge changes. > ... > (come back a couple of days later) > $ cvs update > (merge conflicts, make some more changes) > ... Same as above. > $ cvs update > (test changes, write changelog, send diff for review) > ... No different, if this is how you choose to use GIT. > $ cvs update > (test changes again, fixup changelog) No difference. > $ cvs commit git commit then git push > With lots of "cvs diff" invocations in between to check my changes and > remind myself what I'm working on. I think this is where GIT would benefit most. This is something that GIT, imo, does far faster, and far better than CVS. > I've used SVN, Mercurial and all of those VCSes have commands that are > close enough to CVS that they've allowed me to keep the same workflow > and didn't require me to look at their documentation for every command > I run. But I don't see how your workflow changes, at all. You can use GIT with a CVS-like workflow just fine. > With GIT there's several additional commands I have to run, > and I have to commit half-finished work, which I can't bring myself to > do. (I've tried git stash, but it didn't seem to support my > development style, at least "unstashing" didn't "just work" when I did > a git fetch in between). Nope, you don't have to commit half finished work at all. Commit it if you want, or just keep it local as with CVS. > 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? I don't know. My one brief experience with bzr while checking out emacs was painfully slow. Cheers, Phil