Problem with files on savannah

Problem with files on savannah

[Richard Stallman]

I tried to do an update, and it got an error:

  Could not find desired version 1.574 in /cvsroot/emacs/emacs/admin/FOR-RELEASE,v

Maybe I can work around this by making a new checkout, but then I
won't get my other changes merged in.  Is that the only way?
Is the bug in the files on savannah, or is my old checkout inconsistent
with it somehow?

Re: Problem with files on savannah

[Andreas Schwab]

Richard Stallman <rms@gnu.org> writes:

> I tried to do an update, and it got an error:
>
>   Could not find desired version 1.574 in /cvsroot/emacs/emacs/admin/FOR-RELEASE,v
>
> Maybe I can work around this by making a new checkout, but then I
> won't get my other changes merged in.  Is that the only way?

Probably yes.  You could also try to edit CVS/Entries and hope for the
best.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Problem with files on savannah

[Miles Bader]

Andreas Schwab <schwab@suse.de> writes:
>>   Could not find desired version 1.574 in /cvsroot/emacs/emacs/admin/FOR-RELEASE,v
>>
>> Maybe I can work around this by making a new checkout, but then I
>> won't get my other changes merged in.  Is that the only way?
>
> Probably yes.  You could also try to edit CVS/Entries and hope for the
> best.

One thing I often do in such a case (where the CVS dirs got messed up)
is to make a new checkout in a different directory, and copy _only the
CVS dirs_ to the old tree.

E.g.:

   $ cvs -d ... co -d new-checkout emacs
   $ cd new-checkout
   $ find . -name CVS -print | xargs tar cf ../new-cvs-dirs.tar
   $ cd ../old-checkout
   $ find . -name CVS -print | xargs rm -rv
   $ tar xvf ../new-cvs-dirs.tar

[Usually I make a tar-file with the old CVS dirs before removing them,
just in case...]

-Miles
-- 
"Though they may have different meanings, the cries of 'Yeeeee-haw!' and
 'Allahu akbar!' are, in spirit, not actually all that different."