From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-return-40017-listarch-gdb=sources.redhat.com@sourceware.org>
Received: (qmail 27225 invoked by alias); 14 Oct 2011 16:10:36 -0000
Received: (qmail 27215 invoked by uid 22791); 14 Oct 2011 16:10:34 -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 16:10:21 +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 p9EGAJYe013702	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);	Fri, 14 Oct 2011 12:10:19 -0400
Received: from hase.home (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 p9EGAHZg023200;	Fri, 14 Oct 2011 12:10:17 -0400
From: Andreas Schwab <schwab@redhat.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: pmuldoon@redhat.com, mark.kettenis@xs4all.nl, gdb@sourceware.org
Subject: Re: GIT and CVS
References: <m3sjmwn0nh.fsf@redhat.com> <83r52g1rly.fsf@gnu.org>	<m37h48mqbh.fsf@redhat.com> <83hb3ckn2s.fsf@gnu.org>	<201110141022.p9EAMrUN030848@glazunov.sibelius.xs4all.nl>	<m3d3dzoccj.fsf@redhat.com> <83zkh3k419.fsf@gnu.org>
X-Yow: This TOPS OFF my partygoing experience!  Someone I DON'T LIKE is talking to me about a HEART-WARMING European film..
Date: Fri, 14 Oct 2011 16:12:00 -0000
In-Reply-To: <83zkh3k419.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 14 Oct	2011 17:04:50 +0200")
Message-ID: <m3r52fimfp.fsf@hase.home>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Mailing-List: contact gdb-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb.sourceware.org>
List-Subscribe: <mailto:gdb-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb/>
List-Post: <mailto:gdb@sourceware.org>
List-Help: <mailto:gdb-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-owner@sourceware.org
X-SW-Source: 2011-10/txt/msg00142.txt.bz2

Eli Zaretskii <eliz@gnu.org> writes:

> Then why does the man page says it's "discouraged"?
>
>        Warning: Running git pull (actually, the underlying git merge) with
>        uncommitted changes is discouraged: while possible, it leaves you in a
>        state that is hard to back out of in the case of a conflict.

cvs doesn't warn you, but the effect is the same.

Andreas.

-- 
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."