From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stephen Berman Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Fri, 21 Nov 2014 11:34:20 +0100 Message-ID: <87lhn4n8pf.fsf@rosalinde.fritz.box> References: <871toysqyq.fsf@rosalinde.fritz.box> <838uj57u5b.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416566092 11493 80.91.229.3 (21 Nov 2014 10:34:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 21 Nov 2014 10:34:52 +0000 (UTC) Cc: emacs-devel@gnu.org, Yuri Khan To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 21 11:34:47 2014 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 1XrlY5-0007AI-Vs for ged-emacs-devel@m.gmane.org; Fri, 21 Nov 2014 11:34:46 +0100 Original-Received: from localhost ([::1]:39889 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrlY5-0005dm-Jv for ged-emacs-devel@m.gmane.org; Fri, 21 Nov 2014 05:34:45 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrlXw-0005dU-Po for emacs-devel@gnu.org; Fri, 21 Nov 2014 05:34:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrlXq-0007Ih-Q1 for emacs-devel@gnu.org; Fri, 21 Nov 2014 05:34:36 -0500 Original-Received: from mout.gmx.net ([212.227.17.22]:54379) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrlXk-0007Hh-Ad; Fri, 21 Nov 2014 05:34:24 -0500 Original-Received: from rosalinde.fritz.box ([89.245.122.145]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0LxLcc-1Y2Rxn1kok-016vp5; Fri, 21 Nov 2014 11:34:21 +0100 In-Reply-To: <838uj57u5b.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 20 Nov 2014 17:45:36 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:OX9S/UR886PduibZKtD4NIq0ejluBBO6mDYMXruEJ+r9rARWLmv eGLll02UtkbY7/sTyMjvBCbi0kjnYplfUv6zbcI0sNEf6puPjj0D1YrV0RV9DCJ7AWoH9B9 jn5JBdaIo1hV97ucqwAC1b0RDJaqhdJyJCxnzQG0qyJZR49BnXz++/bOv7w1pxnDKwhgWoU OUsqpc++1uMXQUHd0SJFw== X-UI-Out-Filterresults: notjunk:1; X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.17.22 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:177933 Archived-At: On Thu, 20 Nov 2014 17:45:36 +0200 Eli Zaretskii wrote: >> Date: Thu, 20 Nov 2014 10:29:30 +0700 >> From: Yuri Khan >> Cc: Emacs developers >> >> > GitForEmacsDevs says this: >> > >> > If you are a committer, you can merge to the upstream master directly. >> > >> > First, update your repository: >> > >> > cd $DEVHOME/emacs >> > git checkout master >> > git pull >> > git merge TASKNAME >> > git push >> > >> > Run the tests: >> > >> > make check >> > >> > and then commit >> > >> > git status >> > git commit -m "fixes debbugs:12345" >> > >> > which merges all your new commits to the upstream master. >> > >> > I don't understand why `git commit' follows `git push' here (or why >> > there isn't another `git push' after `git commit'). >> >> Indeed, the instruction quoted above is strange. > > These instructions were simply wrong. You will see that I raised some > of these issues as early as last January: > > http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00790.html > > but nothing was done about that. > > I now fixed the instructions as best I could; please read and comment. The only comment I'm qualified to make is: it's much clearer now, thanks. Steve Berman