From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11410 invoked by alias); 14 Oct 2011 15:42:57 -0000 Received: (qmail 11398 invoked by uid 22791); 14 Oct 2011 15:42:55 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp1.ugent.be (HELO smtp1.UGent.be) (157.193.71.182) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 14 Oct 2011 15:42:36 +0000 Received: from localhost (mcheck5.ugent.be [157.193.49.247]) by smtp1.UGent.be (Postfix) with ESMTP id ACA033F7048; Fri, 14 Oct 2011 17:42:35 +0200 (CEST) Received: from smtp1.UGent.be ([157.193.71.182]) by localhost (mcheck5.UGent.be [157.193.43.11]) (amavisd-new, port 10024) with ESMTP id NJyz+IQTHPLo; Fri, 14 Oct 2011 17:42:35 +0200 (CEST) Received: from [192.168.1.2] (unknown [91.182.126.244]) (Authenticated sender: jmaebe) by smtp1.UGent.be (Postfix) with ESMTPSA id 12DA83F7044; Fri, 14 Oct 2011 17:42:35 +0200 (CEST) Subject: Re: GIT and CVS Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: Jonas Maebe In-Reply-To: <83zkh3k419.fsf@gnu.org> Date: Fri, 14 Oct 2011 15:47:00 -0000 Cc: pmuldoon@redhat.com, mark.kettenis@xs4all.nl, gdb@sourceware.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <83r52g1rly.fsf@gnu.org> <83hb3ckn2s.fsf@gnu.org> <201110141022.p9EAMrUN030848@glazunov.sibelius.xs4all.nl> <83zkh3k419.fsf@gnu.org> To: Eli Zaretskii X-j-chkmail-Enveloppe: 4E98586A.065 from unknown/244.126-182-91.adsl-dyn.isp.belgacom.be/91.182.126.244/[192.168.1.2]/ X-j-chkmail-Score: MSGID : 4E98586A.065 on smtp1.UGent.be : j-chkmail score : X : R=. U=. O=## B=0.000 -> S=0.166 X-j-chkmail-Status: Ham 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/msg00138.txt.bz2 On 14 Oct 2011, at 17:04, Eli Zaretskii wrote: > From: Phil Muldoon > Cc: eliz@gnu.org, gdb@sourceware.org > Date: Fri, 14 Oct 2011 15:51:40 +0100 >=20 >> git pull will fetch and merge changes. >=20 > Then why does the man page says it's "discouraged"? >=20 > Warning: Running git pull (actually, the underlying git merge) with > uncommitted changes is discouraged: while possible, it leaves you i= n a > state that is hard to back out of in the case of a conflict. >=20 > That sounds like "don't do it". What they describe is the same behaviour you get when doing a cvs update on= a dirty tree: in case there are conflicts, you don't have a copy anymore o= f your original patch against the version to which it cleanly applied. They= discourage that because that can be annoying. In case of a git stash or br= anch (which in case of cvs would correspond to something like "cvs diff > p= reupdate.patch", optionally with a record of the current revisions of all f= iles involved), you keep a clean copy of your patch in its original version= for comparison purposes afterwards. Jonas