| Re: CVS and IDL - RCS tags [message #44722] |
Mon, 11 July 2005 12:30 |
JD Smith
Messages: 850
Registered: December 1999
|
Senior Member |
|
|
On Mon, 11 Jul 2005 14:00:22 +0200, Ben Panter wrote:
> I've been using CVS for the last six months or so to maintain my IDL
> codes, and I think it is absolutly fantastic. The only problem I get is
> trying to work out what version of the code is running on a remote
> machine, or which version of the code generated some results. After a bit
> of research in the archives, I found out about RCS tags - specifically
> $Id$ - which would do the job perfectly.
Not really related, I know, but I thought I'd mention that Emacs has
excellent built-in CVS support, so using IDLWAVE with CVS is a joy. I
find I use C-x v = (show differences to last checked in version) quite
often, and the color coded annotation (C-x v g) is useful for a rough
guide to when various parts of the file where modified. I never visit
the command line for CVS anymore, except for the occasional
multi-file check-in. That said, I've used $Date$ and $Id$ without
problem in the header comments, so it must be your client (e.g. binary
files have keyword expansion turned off, for obvious reasons).
JD
|
|
|
|
| Re: CVS and IDL - RCS tags [message #44727 is a reply to message #44722] |
Mon, 11 July 2005 08:02  |
Karl Schultz
Messages: 341
Registered: October 1999
|
Senior Member |
|
|
On Mon, 11 Jul 2005 16:39:08 +0200, Ben Panter wrote:
> Ben Panter wrote:
>> Karl Schultz wrote:
>>
>>> It could be that your CVS client is turning off keyword substitution.
>>>
>>> You might look at
>>> https://www.cvshome.org/docs/manual/cvs-1.11.7/cvs_12.html#S EC101
>>
>>
>> Thanks Karl - I'll have a go at this.
>>
>> The files are defintly not uploaded as binary
Still, you might try 'cvs status filename' to make sure. Sometimes a
sticky flag might be set.
>
> Yeup, all are set as ASCII -kvv in the client, so unfortunatly that
> hasn't helped. I wonder if there is some setting on the CVS server
> itself which is stopping the replacement?
kvv? Maybe you meant kkv?
You could try 'cvs co CVSROOT' and look at the config file.
At this point, I don't think that this is an IDL issue and you might get
better answers looking/googling for CVS info on the web.
Karl
|
|
|
|
| Re: CVS and IDL - RCS tags [message #44728 is a reply to message #44727] |
Mon, 11 July 2005 07:53 |
Ben Panter
Messages: 102
Registered: July 2003
|
Senior Member |
|
|
Karl and others,
I think I have a solution. In frustration I just deleted my local copy
entirely and did a cvs checkout moped - and miraculously all the tags
have been replaced with the correct strings!
I still have no idea was is going on[1], but I am at least happy with
the result. Thanks for all your advice,
Ben
[1] This is a pretty familar feeling for me these days.
--
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Ben Panter, Garching, Germany
email via www.benpanter.co.uk
|
|
|
|
| Re: CVS and IDL - RCS tags [message #44729 is a reply to message #44728] |
Mon, 11 July 2005 07:39 |
Ben Panter
Messages: 102
Registered: July 2003
|
Senior Member |
|
|
Ben Panter wrote:
> Karl Schultz wrote:
>
>> It could be that your CVS client is turning off keyword substitution.
>>
>> You might look at
>> https://www.cvshome.org/docs/manual/cvs-1.11.7/cvs_12.html#S EC101
>
>
> Thanks Karl - I'll have a go at this.
>
> The files are defintly not uploaded as binary
Yeup, all are set as ASCII -kvv in the client, so unfortunatly that
hasn't helped. I wonder if there is some setting on the CVS server
itself which is stopping the replacement?
Ben
--
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Ben Panter, Garching, Germany
email via www.benpanter.co.uk
|
|
|
|
| Re: CVS and IDL - RCS tags [message #44730 is a reply to message #44729] |
Mon, 11 July 2005 07:23 |
Paolo Grigis
Messages: 171
Registered: December 2003
|
Senior Member |
|
|
Sorry, I wasn't thinking straight... just forget my nonsense.
--Paolo
Ben Panter wrote:
> Paolo Grigis wrote:
>
>> What happens if you do a "cvs commit" after the update?
>
>
> do you mean on the remote machine? It doesn't seem to help:
>
> [bdp@obrero1 bdp]$ cvs update moped
> cvs server: Updating moped
> cvs server: Updating moped/BULK
> cvs server: Updating moped/DEEP2
> cvs server: Updating moped/GDDS
> cvs server: Updating moped/GOODS
> cvs server: Updating moped/HR
> U moped/HR/hr_mcmc.pro
> U moped/HR/prep_spectra_3A.pro
> cvs server: Updating moped/KM
> cvs server: Updating moped/SPEC_IDL
> cvs server: Updating moped/TOOLS
> [bdp@obrero1 bdp]$ cvs commit moped
> cvs commit: Examining moped
> cvs commit: Examining moped/BULK
> cvs commit: Examining moped/DEEP2
> cvs commit: Examining moped/GDDS
> cvs commit: Examining moped/GOODS
> cvs commit: Examining moped/HR
> cvs commit: Examining moped/KM
> cvs commit: Examining moped/SPEC_IDL
> cvs commit: Examining moped/TOOLS
> [bdp@obrero1 bdp]$ grep moped/HR/hr_setup.pro Id
> grep: Id: No such file or directory
> [bdp@obrero1 bdp]$ grep Idmoped/HR/hr_setup.pro
>
> [bdp@obrero1 bdp]$ grep Id moped/HR/hr_setup.pro
> SetName='DR3 3AA LMC 1p Dust. VD=170' + '$Id$'
> FNexpspec = 'expSpecIdl.dat'
> ;$Id: $
> [bdp@obrero1 bdp]$
>
>
>
|
|
|
|
|
|
| Re: CVS and IDL - RCS tags [message #44732 is a reply to message #44731] |
Mon, 11 July 2005 07:14 |
Ben Panter
Messages: 102
Registered: July 2003
|
Senior Member |
|
|
Paolo Grigis wrote:
> What happens if you do a "cvs commit" after the update?
do you mean on the remote machine? It doesn't seem to help:
[bdp@obrero1 bdp]$ cvs update moped
cvs server: Updating moped
cvs server: Updating moped/BULK
cvs server: Updating moped/DEEP2
cvs server: Updating moped/GDDS
cvs server: Updating moped/GOODS
cvs server: Updating moped/HR
U moped/HR/hr_mcmc.pro
U moped/HR/prep_spectra_3A.pro
cvs server: Updating moped/KM
cvs server: Updating moped/SPEC_IDL
cvs server: Updating moped/TOOLS
[bdp@obrero1 bdp]$ cvs commit moped
cvs commit: Examining moped
cvs commit: Examining moped/BULK
cvs commit: Examining moped/DEEP2
cvs commit: Examining moped/GDDS
cvs commit: Examining moped/GOODS
cvs commit: Examining moped/HR
cvs commit: Examining moped/KM
cvs commit: Examining moped/SPEC_IDL
cvs commit: Examining moped/TOOLS
[bdp@obrero1 bdp]$ grep moped/HR/hr_setup.pro Id
grep: Id: No such file or directory
[bdp@obrero1 bdp]$ grep Idmoped/HR/hr_setup.pro
[bdp@obrero1 bdp]$ grep Id moped/HR/hr_setup.pro
SetName='DR3 3AA LMC 1p Dust. VD=170' + '$Id$'
FNexpspec = 'expSpecIdl.dat'
;$Id: $
[bdp@obrero1 bdp]$
--
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Ben Panter, Garching, Germany
email via www.benpanter.co.uk
|
|
|
|
| Re: CVS and IDL - RCS tags [message #44733 is a reply to message #44732] |
Mon, 11 July 2005 07:09 |
Paolo Grigis
Messages: 171
Registered: December 2003
|
Senior Member |
|
|
What happens if you do a "cvs commit" after the update?
--Paolo
Ben Panter wrote:
> Rob wrote:
>
>> We have been able to do this by making this a comment in the header
>> part of the code prior to adding and committing:
>>
>> ;$Id: $
>>
>> When you look at it after committing it then you should see the version
>> info filled in for you. One might look like the following:
>>
>> ; $Id: cw_color_button.pro,v 1.16 2005/07/06 16:34:25 rdimeo Exp $
>
>
> Thanks for your help, I'm afraid I'm still not getting it!
>
> OK - I must be doing something wrong here. I'm using eclipse, so I open
> the file and edit it. I add the string that you suggested half way
> through the file:
>
> ;$Id: $
>
> then save the file and commit it to the archive.
>
> I then log into one of my other machines, and do a CVS update:
>
> [bdp@obrero1 bdp]$ cvs update moped
> cvs server: Updating moped
> cvs server: Updating moped/BULK
> cvs server: Updating moped/DEEP2
> cvs server: Updating moped/GDDS
> cvs server: Updating moped/GOODS
> cvs server: Updating moped/HR
> U moped/HR/hr_setup.pro
> cvs server: Updating moped/KM
> cvs server: Updating moped/SPEC_IDL
> cvs server: Updating moped/TOOLS
>
> and indeed, hr_setup.pro has been updated, but still reads:
>
> ;$Id: $
>
> at the line I changed.
>
> Any suggestions?
>
|
|
|
|
| Re: CVS and IDL - RCS tags [message #44734 is a reply to message #44733] |
Mon, 11 July 2005 07:02 |
Karl Schultz
Messages: 341
Registered: October 1999
|
Senior Member |
|
|
On Mon, 11 Jul 2005 15:03:31 +0200, Ben Panter wrote:
> Rob wrote:
>> We have been able to do this by making this a comment in the header
>> part of the code prior to adding and committing:
>>
>> ;$Id: $
>>
>> When you look at it after committing it then you should see the version
>> info filled in for you. One might look like the following:
>>
>> ; $Id: cw_color_button.pro,v 1.16 2005/07/06 16:34:25 rdimeo Exp $
>
> Thanks for your help, I'm afraid I'm still not getting it!
>
> OK - I must be doing something wrong here. I'm using eclipse, so I open
> the file and edit it. I add the string that you suggested half way
> through the file:
>
> ;$Id: $
>
> then save the file and commit it to the archive.
>
> I then log into one of my other machines, and do a CVS update:
>
> [bdp@obrero1 bdp]$ cvs update moped
> cvs server: Updating moped
> cvs server: Updating moped/BULK
> cvs server: Updating moped/DEEP2
> cvs server: Updating moped/GDDS
> cvs server: Updating moped/GOODS
> cvs server: Updating moped/HR
> U moped/HR/hr_setup.pro
> cvs server: Updating moped/KM
> cvs server: Updating moped/SPEC_IDL
> cvs server: Updating moped/TOOLS
>
> and indeed, hr_setup.pro has been updated, but still reads:
>
> ;$Id: $
>
> at the line I changed.
>
> Any suggestions?
It could be that your CVS client is turning off keyword substitution.
You might look at
https://www.cvshome.org/docs/manual/cvs-1.11.7/cvs_12.html#S EC101
and the docs for whatever it is that you are using to actually check in
the code to see if you are turning off substition by accident. Your
check-in client might have a preference or setting that is passing the
"don't expand keywords" option to CVS.
Check for a cvswrapper that might be setting this option.
If your file is checked in as a binary file, CVS will not do kwd
expansion.
Karl
|
|
|
|
| Re: CVS and IDL - RCS tags [message #44735 is a reply to message #44734] |
Mon, 11 July 2005 06:03 |
Ben Panter
Messages: 102
Registered: July 2003
|
Senior Member |
|
|
Rob wrote:
> We have been able to do this by making this a comment in the header
> part of the code prior to adding and committing:
>
> ;$Id: $
>
> When you look at it after committing it then you should see the version
> info filled in for you. One might look like the following:
>
> ; $Id: cw_color_button.pro,v 1.16 2005/07/06 16:34:25 rdimeo Exp $
Thanks for your help, I'm afraid I'm still not getting it!
OK - I must be doing something wrong here. I'm using eclipse, so I open
the file and edit it. I add the string that you suggested half way
through the file:
;$Id: $
then save the file and commit it to the archive.
I then log into one of my other machines, and do a CVS update:
[bdp@obrero1 bdp]$ cvs update moped
cvs server: Updating moped
cvs server: Updating moped/BULK
cvs server: Updating moped/DEEP2
cvs server: Updating moped/GDDS
cvs server: Updating moped/GOODS
cvs server: Updating moped/HR
U moped/HR/hr_setup.pro
cvs server: Updating moped/KM
cvs server: Updating moped/SPEC_IDL
cvs server: Updating moped/TOOLS
and indeed, hr_setup.pro has been updated, but still reads:
;$Id: $
at the line I changed.
Any suggestions?
--
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Ben Panter, Garching, Germany
email via www.benpanter.co.uk
|
|
|
|
| Re: CVS and IDL - RCS tags [message #44736 is a reply to message #44735] |
Mon, 11 July 2005 05:52 |
Rob Dimeo
Messages: 17
Registered: November 1999
|
Junior Member |
|
|
Ben,
We have been able to do this by making this a comment in the header
part of the code prior to adding and committing:
;$Id: $
When you look at it after committing it then you should see the version
info filled in for you. One might look like the following:
; $Id: cw_color_button.pro,v 1.16 2005/07/06 16:34:25 rdimeo Exp $
Cheers,
Rob
|
|
|
|
comp.lang.idl-pvwave archive
Members
Search
Help
Login
Home
