From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 21:15:58 +0300 Message-ID: <83zj6ml9up.fsf@gnu.org> References: <83twx2xoc8.fsf@gnu.org> <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> <551FA7F6.8060103@math.ntnu.no> <87wq1rfvvp.fsf@uwakimon.sk.tsukuba.ac.jp> <87619bbmgj.fsf@nautilus.nautilus> <87r3rzfpvh.fsf@uwakimon.sk.tsukuba.ac.jp> <83vbhan3rb.fsf@gnu.org> <552130A3.5060001@math.ntnu.no> <83oan2n2wv.fsf@gnu.org> <83lhi6n2gi.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428257788 25518 80.91.229.3 (5 Apr 2015 18:16:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 18:16:28 +0000 (UTC) Cc: lele@metapensiero.it, stephen@xemacs.org, hanche@math.ntnu.no, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 20:16:18 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 1Yep5k-0008V4-Ke for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 20:16:16 +0200 Original-Received: from localhost ([::1]:37264 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yep5j-0002RG-Ul for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 14:16:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40217) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yep5X-0002Qo-3S for emacs-devel@gnu.org; Sun, 05 Apr 2015 14:16:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yep5S-0002zJ-G0 for emacs-devel@gnu.org; Sun, 05 Apr 2015 14:16:03 -0400 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:55217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yep5S-0002zF-86; Sun, 05 Apr 2015 14:15:58 -0400 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NMC00300IJ20E00@mtaout26.012.net.il>; Sun, 05 Apr 2015 21:17:09 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMC003FIISKOP00@mtaout26.012.net.il>; Sun, 05 Apr 2015 21:17:09 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 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:184954 Archived-At: > Date: Sun, 05 Apr 2015 13:42:44 -0400 > From: Richard Stallman > Cc: lele@metapensiero.it, stephen@xemacs.org, hanche@math.ntnu.no, > emacs-devel@gnu.org > > 'git diff origin/master' showed the changes in all three files. > Then I did git commit and git push. Why didn't that install them? It did, I see the changes in my local clone of savannah. > I did git pull again, and it told me there was a problem > lisp/ChangeLog again, but there was no conflict in it. > Then I did git commit again. Try this: . copy lisp/ChangeLog to some place safe . type "git checkout lisp/ChangeLog" . type "git pull" Does the last "git pull" report any problems? If so, which ones? If it doesn't report any problems, what is the diff between lisp/ChangeLog produced by the "git checkout" command and the copy you copied to that other place?