Off topic: help with CVS, please!

Off topic: help with CVS, please!

[Alan Mackenzie]

Hi, Emacs!

Could somebody help me with CVS, please.

I've got the CC Mode repository into a mess.  The head of cc-langs.el is
5.288, and contains crud.  I want to (somehow) get 5.286 and (somehow)
commit it, so that it becomes head.

I tried deleting cc-langs.el and
    # cvs update -r5.286 cc-langs.el
An immediate "cvs update" then failed, without contacting the server or
giving an error message.

I then tried something or other (can't remember exactly what), but
managed to damage CVS/Entries.  Then I tried to download 5.286 to
standard output.  There doesn't seem to be a nice
simple command like
    # cvs get -r5.286 cc-langs.el > /path/to/temp_file.el
, which would just get a file version without having to worry about
fouling anything up.

There's something similar which I tried, namely:
    # cvs update -p r5.286 cc-langs.el > /path/to/temp_file.el,
but I'm not convinced I got 5.286, and I'm now too frustrated and
confused to check reliably.

Could somebody with a clear head please suggest a recipe to me for
obtaining 5.286 and committing it, unchanged, over 5.288 to become the
new head.

Thanks in advance!

-- 
Alan Mackenzie (Nuremberg, Germany).

Re: Off topic: help with CVS, please!

[Chong Yidong]

Alan Mackenzie <acm@muc.de> writes:

> Could somebody with a clear head please suggest a recipe to me for
> obtaining 5.286 and committing it, unchanged, over 5.288 to become the
> new head.

Why not use VC?  From the *vc-change-log* buffer (C-x v l), type `f' on
the desired revision entry to visit that revision.  Then save the buffer
and do `C-x v v' to commit it.

Re: Off topic: help with CVS, please!

[Tom Tromey]

>>>>> "Alan" == Alan Mackenzie <acm@muc.de> writes:

Alan> I tried deleting cc-langs.el and
Alan>     # cvs update -r5.286 cc-langs.el

This will check out the revision but also make a sticky tag.
Copy cc-langs.el somewhere safe, then "cvs update -A".
Then copy it back.

Alan> There doesn't seem to be a nice
Alan> simple command like
Alan>     # cvs get -r5.286 cc-langs.el > /path/to/temp_file.el

You can use "cvs co -p" for this.

You can also do a reverse merge on a pristine tree:

   cvs update -j5.288 -j5.286 cc-langs.el

... or make a reverse patch that way and apply it.

Tom

Re: Off topic: help with CVS, please!

[Thien-Thi Nguyen]

() Tom Tromey <tromey@redhat.com>
() Sun, 22 Feb 2009 14:02:51 -0700

   You can use "cvs co -p" for this.

You can get Emacs to do this (and save to FILENAME.~REVISION~)
with `C-x v ~' (vc-revision-other-window).

thi

Re: Off topic: help with CVS, please!

[Alan Mackenzie]

Hi, Tom!

On Sun, Feb 22, 2009 at 02:02:51PM -0700, Tom Tromey wrote:
> >>>>> "Alan" == Alan Mackenzie <acm@muc.de> writes:

> Alan> I tried deleting cc-langs.el and
> Alan>     # cvs update -r5.286 cc-langs.el

> This will check out the revision but also make a sticky tag.
> Copy cc-langs.el somewhere safe, then "cvs update -A".
> Then copy it back.

Done that.  It worked!

> Alan> There doesn't seem to be a nice
> Alan> simple command like
> Alan>     # cvs get -r5.286 cc-langs.el > /path/to/temp_file.el

> You can use "cvs co -p" for this.

Does cvs checkout work on a single file?

> You can also do a reverse merge on a pristine tree:

>    cvs update -j5.288 -j5.286 cc-langs.el

Did that.  It worked, too!

> ... or make a reverse patch that way and apply it.

Many thanks!  I've now got things consistent again.

> Tom

-- 
Alan Mackenzie (Nuremberg, Germany).

Re: Off topic: help with CVS, please!

[Stefan Monnier]

Alan> # cvs get -r5.286 cc-langs.el > /path/to/temp_file.el
>> You can use "cvs co -p" for this.
> Does cvs checkout work on a single file?

I can never remember where/how `checkout' can be used when working
inside a tree and what it really does, but AFAIK everytime it does
something useful within a tree, the same result can be obtained with
`update' instead.
This is no exception: "cvs update -p -rREV FILE >TEMPFILE".


        Stefan