From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Stash Date: Sun, 05 Apr 2015 11:40:17 -0700 Organization: UCLA Computer Science Department Message-ID: <55218191.1060602@cs.ucla.edu> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1428259256 14825 80.91.229.3 (5 Apr 2015 18:40:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 18:40:56 +0000 (UTC) To: rms@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 20:40:48 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 1YepTT-0008QP-Lu for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 20:40:47 +0200 Original-Received: from localhost ([::1]:37306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YepTT-00082L-3L for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 14:40:47 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YepTC-00082E-G2 for emacs-devel@gnu.org; Sun, 05 Apr 2015 14:40:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YepT7-0002f7-DM for emacs-devel@gnu.org; Sun, 05 Apr 2015 14:40:30 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:42142) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YepT7-0002YP-55; Sun, 05 Apr 2015 14:40:25 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 08B6239E801D; Sun, 5 Apr 2015 11:40:18 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zq+gXXOMT-JB; Sun, 5 Apr 2015 11:40:17 -0700 (PDT) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 57DE739E8018; Sun, 5 Apr 2015 11:40:17 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 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:184960 Archived-At: Richard Stallman wrote: > Is there any way I can fix this other than creating a new repository? > I should not do that here; it would cost my host too much money, I > fear. There shouldn't be any need to fear. It should be cheap to create a new repository that is suitable for pushing to Savannah. You shouldn't need to re-copy everything from Savannah; instead, you should be able to clone what you have locally, fix the cloned repository so that its master branch exactly matches Savannah's, apply your fixes to the cloned repository, and push them. If your working copy of the source is in /home/rms/src/emacs and it is in the master branch, you can do this: cd /home/rms/src git clone emacs emacs-new cd emacs-new git branch -m master master-old git branch --track master origin/master git checkout master git pull At this point, /home/rms/src/emacs will contain the old copy of Emacs with whatever glitches are causing problems for you, and /home/rms/src/emacs-new will contain a fresh new copy with a master branch that matches what's in Savannah and with another branch 'master-old' containing the last things you installed in the old copy. Only one step in the above recipe requires network access, the "git pull", and it should be pulling recent deltas so it should be cheap (and the deltas are necessary under any workflow). Once you've built the fresh new copy, you should be able to edit it, commit changes, and then do a "git push" (which will be the 2nd step that requires network access).