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: VC mode and git Date: Sun, 05 Apr 2015 13:42:04 -0400 Message-ID: References: <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <837ftspcis.fsf@gnu.org> <87vbhbft9a.fsf@uwakimon.sk.tsukuba.ac.jp> <83619bnjsy.fsf@gnu.org> <87mw2nf01y.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1428255749 25938 80.91.229.3 (5 Apr 2015 17:42:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 17:42:29 +0000 (UTC) Cc: eliz@gnu.org, sorganov@gmail.com, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 19:42:21 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 1YeoYt-0003Ko-9M for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 19:42:19 +0200 Original-Received: from localhost ([::1]:37156 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoYs-000895-IW for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 13:42:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoYg-000890-9Y for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:42:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeoYf-0001US-AA for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:42:06 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:49685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoYf-0001UL-6k for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:42:05 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YeoYe-0007r3-1X; Sun, 05 Apr 2015 13:42:04 -0400 In-reply-to: <87mw2nf01y.fsf@uwakimon.sk.tsukuba.ac.jp> (stephen@xemacs.org) 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:184940 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. ]]] > But some log messages were missing. (This makes no sense to me, > unless somehow he did not see messages that said that the merge was > not performed. Is it possible that vc displays messages from > stdout but not stderr or something like that? I'm grasping at > straws, I know -- but Richard is a good bug reporter, and yet what > he reports doesn't make sense.) I typed 'git pull' in a terminal. Since that tends to spew lots of output, I probably did not look at the output. I did not realize there was any chance it might fail! I expected the possibility of conflicts, but I expected to find out about them and fix them. -- 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.