From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: Stash Date: Wed, 08 Apr 2015 14:21:36 -0400 Message-ID: References: <86sice77h0.fsf@dod.no> <83iod9lnp0.fsf@gnu.org> <83a8yjj348.fsf@gnu.org> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1428517328 5349 80.91.229.3 (8 Apr 2015 18:22:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Apr 2015 18:22:08 +0000 (UTC) Cc: sb@dod.no, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 08 20:21:53 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yfubo-0000Mc-8p for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 20:21:52 +0200 Original-Received: from localhost ([::1]:54269 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yfubn-0000Bt-Ge for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 14:21:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfubZ-0000BA-SN for emacs-devel@gnu.org; Wed, 08 Apr 2015 14:21:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfubY-0007Jq-NR for emacs-devel@gnu.org; Wed, 08 Apr 2015 14:21:37 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37594) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfubY-0007Jm-K7 for emacs-devel@gnu.org; Wed, 08 Apr 2015 14:21:36 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YfubY-0007an-0a; Wed, 08 Apr 2015 14:21:36 -0400 In-reply-to: <83a8yjj348.fsf@gnu.org> (message from Eli Zaretskii on Tue, 07 Apr 2015 19:48:55 +0300) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:185165 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > * cvs up indicates in a very visible way which files I have local changes in. > You mean, the "C" conflict marker? Or do you mean something else? Usually M because there are no conflicts. Occasionally there is a conflict so it says C. > > What's more, if it mentions many other files, I can do cvs up again > > immediately and see ONLY the files I have local changes in. > As I said, you need to use "git status" for that. It will show the > same output if invoked repeatedly. One more hassle of using Git. > > * cvs up will not "fail". The worst that can happen is that some > > file has a conflict, and if I don't bother with it immediately, > > I will get reminded of it later. > Right, but this is unrelated to the display during "pull". The point is that the output from pull is long and mostly meaningless, so I didn't look at it at all. > Not sure what you allude to here. Is that the diffstat display of the > amount of changes in each file? That, and all the rest of the output. It is verbose and doesn't tell me anything useful, so I don't look at it. > > People said that git merge can fail for another reason (I forget > > what), not only because of conflicts. > I'm not aware of any, unless they meant uncommitted changes in the > same files that were changed upstream (which is covered on the Wiki > under "conflicts"). Yes, that was it. -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! See stallman.org/skype.html.