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: Thu, 20 Nov 2014 13:28:37 +0100 Message-ID: <877fyqt5sa.fsf@rosalinde.fritz.box> References: <871toysqyq.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416486692 19650 80.91.229.3 (20 Nov 2014 12:31:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Nov 2014 12:31:32 +0000 (UTC) Cc: emacs-devel@gnu.org, Yuri Khan To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 20 13:31:26 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 1XrQtR-000894-BE for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 13:31:25 +0100 Original-Received: from localhost ([::1]:34942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrQtQ-0004Gb-E8 for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 07:31:24 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrQqw-00013E-7O for emacs-devel@gnu.org; Thu, 20 Nov 2014 07:28:56 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrQqq-0006Os-56 for emacs-devel@gnu.org; Thu, 20 Nov 2014 07:28:50 -0500 Original-Received: from mout.gmx.net ([212.227.15.15]:50953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrQqp-0006Oe-Rz; Thu, 20 Nov 2014 07:28:44 -0500 Original-Received: from rosalinde.fritz.box ([89.245.126.188]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0M0y8F-1Y5mo43Lpv-00v7YD; Thu, 20 Nov 2014 13:28:39 +0100 In-Reply-To: (Glenn Morris's message of "Wed, 19 Nov 2014 21:07:08 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:kw3TIgzn3Dp2D7jgbqwgIhK2RXo7CVbTSFyYl3CVwiqFbpawsZ+ +LPg5a6G5qlbzviCOyn1WjCHw77jEHd4J2j1t+Xa70eYLPfWoN4GHAPT/z6lVIF1I2ItLRU aokIg8ma+FzBekVPBT4OKvx3a5mkouGW+pcTUVgGCUn2CMJXd+GUIOrIEN04glYhKgUzbvp yJntopsT5Wp9UdnQbXK2A== X-UI-Out-Filterresults: notjunk:1; X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.15 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:177871 Archived-At: On Wed, 19 Nov 2014 21:07:08 -0500 Glenn Morris wrote: > Stephen Berman wrote: > >> possible to use VC to push changes to another branch or repository, and >> if so, how? > > `vc-pull' exists, but nobody wrote (or nobody pushed, ha ha) `vc-push'. > > Eg > http://debbugs.gnu.org/12415 > http://lists.gnu.org/archive/html/emacs-devel/2009-12/msg00267.html > http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00842.html On Thu, 20 Nov 2014 10:29:30 +0700 Yuri Khan wrote: > On Thu, Nov 20, 2014 at 5:36 AM, Stephen Berman wrote: > >> 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. [...] Thanks to both of you for the replies. I see that GitForEmacsDevs on the Wiki has been updated in the mean time, so it's clearer (and hopefully correct) now. Steve Berman