From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25047 invoked by alias); 14 Oct 2011 15:05:58 -0000 Received: (qmail 24998 invoked by uid 22791); 14 Oct 2011 15:05:56 -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 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 15:05:42 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9EF5fa3020474 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 14 Oct 2011 11:05:41 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p9EF5b3C031419; Fri, 14 Oct 2011 11:05:40 -0400 From: Phil Muldoon To: Eli Zaretskii Cc: Jan Kratochvil , mark.kettenis@xs4all.nl, gdb@sourceware.org Subject: Re: GIT and CVS References: <83r52g1rly.fsf@gnu.org> <83hb3ckn2s.fsf@gnu.org> <201110141022.p9EAMrUN030848@glazunov.sibelius.xs4all.nl> <20111014125356.GA15329@host1.jankratochvil.net> <831uuflkeq.fsf@gnu.org> Reply-to: pmuldoon@redhat.com X-URL: http://www.redhat.com Date: Fri, 14 Oct 2011 15:05:00 -0000 In-Reply-To: <831uuflkeq.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 14 Oct 2011 16:25:49 +0200") 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/msg00130.txt.bz2 Eli Zaretskii writes: >> Date: Fri, 14 Oct 2011 14:53:56 +0200 >> From: Jan Kratochvil >> Cc: eliz@gnu.org, pmuldoon@redhat.com, gdb@sourceware.org >> >> On Fri, 14 Oct 2011 12:22:53 +0200, Mark Kettenis wrote: >> > $ cvs update >> > (test changes, write changelog, send diff for review) >> [...] >> > With lots of "cvs diff" invocations in between to check my changes and >> > remind myself what I'm working on. >> >> Replace `cvs update' by: git stash; git pull; git stash pop > > But with bzr, you just say "bzr update" and that's it. > >> Replace `cvs diff' by: git diff HEAD > > But with bzr, you just say "bzr diff". If you have your git config setup right, you can use "git pull" to fetch and merge changes in, and "git diff" to get a diff. In fact you can configure GIT in multiple variations. I think that is the strength of GIT. It allows you to use the tool your way, not necessarily how GIT thinks you should. That being said, it gives you enough rope, but then again, so does CVS. > >> (not sure if the latter is needed but IMO it simplifies some assumptions) > > It is indeed one of my problems with git that I'm never sure what will > happen if I omit certain arguments that are supposed to be the > default. But I always thought that was because I don't use git > enough. However, if people like you, who do it all the time, are > still uncertain, then I guess it is something to consider when > selecting a VCS. > >> > and I have to commit half-finished work, >> >> You don't have to. > > You mean, you can pull or merge when you have uncommitted changes? git pull or git fetch/git merge If a conflict arises you have to git stash, then do above, then git stash pop. Or you can just commit your changes locally. The choice is yours. This is not how things are right now with CVS, but those steps are not onerous. Cheers, Phil