Re: [Bodington-developers] cvs HEAD

[Matthew B. <mat...@co...>]

Antony Corfield wrote:
>> Antony Corfield wrote:
>>
>>> Hi I'm (finally) about to merge our branch with HEAD, can someone 
>>> confirm that in the last week these are only changes on head? Is 
>>> WEB-INF/dtd no longer required (files moved to servlet/template)?
> 
> 
> Yep, is this where these files now live i.e. are we removing dtd directory?

CVS doesn't allow you to remove directories. The way most clients work 
is if a directory is empty it is removed so when you do a "cvs update" 
unless you have some uncommited files in the dtd directory (or you 
client isn't configures to prune empty folders) it shoudl disapear.

>> I had some change to eliminate the dependancy on the System property 
>> "bodington.home" that went in recently but these didn't change any 
>> templates.
> 
> 
> That's fine Matthew, just don't want to (accidently) overwrite your 
> commits!

Unless your cvs client doesn't warn you about a attempting to commit a 
file that hasn't yet been updated this shouldn't happen.

Eg:

If we both have version 1.4 of index.html then I commit some changes 
back (now I and the repository have 1.5) then you attempt to commit some 
changes back your client should warn you that you havn't yet pulled in 
the changes between 1.4 and 1.5. If your client doesn't do this get a 
new client (command line one does).

Happy commiting ;-)

-- 
+--Matthew Buckett-----------------------------------------+
| VLE Developer, Learning Technologies Group               |
| Tel: +44 (0) 1865 283660 http://www.oucs.ox.ac.uk/       |
+------------Computing Services, University of Oxford------+