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 20:56:34 +0300 Message-ID: <83619ampbh.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 1428256611 7951 80.91.229.3 (5 Apr 2015 17:56:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 17:56:51 +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 19:56:41 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 1Yeomn-0004Dp-17 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 19:56:41 +0200 Original-Received: from localhost ([::1]:37210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeomm-0005VW-A1 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 13:56:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeomi-0005VJ-Sm for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:56:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yeomf-0006Ef-Mp for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:56:36 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:36088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeome-0006EZ-Vz; Sun, 05 Apr 2015 13:56:33 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NMC00000HRVUW00@a-mtaout23.012.net.il>; Sun, 05 Apr 2015 20:56:31 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMC000DUHU7PT80@a-mtaout23.012.net.il>; Sun, 05 Apr 2015 20:56:31 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 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:184950 Archived-At: > Date: Sun, 05 Apr 2015 13:42:44 -0400 > From: Richard Stallman > CC: hanche@math.ntnu.no, lele@metapensiero.it, stephen@xemacs.org, > emacs-devel@gnu.org > > > The changes pushed include only changes to lisp/ChangeLog. They don't > > include the code changes in rmail.el and in browse-url.el. > > '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 was mistaken. Sorry. > 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. > > Then I did git push again, and got this. > > To rms@git.sv.gnu.org:/srv/git/emacs.git > ! [rejected] master -> master (non-fast-forward) > error: failed to push some refs to 'rms@git.sv.gnu.org:/srv/git/emacs.git' > To prevent you from losing history, non-fast-forward updates were rejected > Merge the remote changes (e.g. 'git pull') before pushing again. See the > 'Note about fast-forwards' section of 'git push --help' for details. > > I have no idea what that means. It means you tried to push some commits that are not descendants of the last commit on savannah. The savannah repository is configured to reject such pushes. What does "git diff origin/master" show now? And what does "git status -s" show? > > My guess would be that these are still stashed, and need to be > > unstashed and then pushed. > > How can I tell? Forget it for now, it was probably my mistake. Your changes in rmail.el and browse-url.el are on savannah. What's left is to find out why you still get error messages when pushing.