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:44 -0400 Message-ID: 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: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1428255830 27068 80.91.229.3 (5 Apr 2015 17:43:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 17:43:50 +0000 (UTC) Cc: lele@metapensiero.it, stephen@xemacs.org, hanche@math.ntnu.no, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 19:43:40 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 1YeoaA-0004Bv-Lt for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 19:43:38 +0200 Original-Received: from localhost ([::1]:37173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoaA-0001eh-7l for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 13:43:38 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoZU-0000Zt-Gh for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:42:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeoZT-0001m1-Je for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:42:56 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:49779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoZT-0001lt-0z for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:42:55 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YeoZI-00083D-0O; Sun, 05 Apr 2015 13:42:44 -0400 In-reply-to: <83lhi6n2gi.fsf@gnu.org> (message from Eli Zaretskii on Sun, 05 Apr 2015 16:12:45 +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:184944 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. ]]] > 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? 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. > My guess would be that these are still stashed, and need to be > unstashed and then pushed. How can I tell? And if those changes are stashed, why did they show up in git diff? -- 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.