Re: Stash

[Paul Eggert]

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).