Re: How to merge with my cvs

[Sasha Case]

At 12:11 AM 13/12/2001 +0100, David D wrote:
> I work with a designer fot my site, I give him a version of my site not
> tagged I think.
> He remove all the cvs dire he s got on it an d gave me his job.

1. Checkout a copy of the module based on date/time using -D.  Use the date 
that you gave him the files.
2. Copy his changed files over to the checked out copy.
3. Do a cvs update to bring in any changes that you have commited since you 
gave the files to the designer, resolve any conflicts and ensure everything 
merged smoothly.
4. cvs commit the changes.
5. If the designer is doing more work, give the designer the up to date 
files, including cvs directories, and tag the appropriate files in the 
repository in case he loses the cvs/ directories again.

Let me know how it goes.

---
Sasha Case
Development Engineer, Clarity EQ Pty Ltd
Tel: +61-2-9905-6277, Fax: +61-2-9905-8066
Public key available at ldap://keyserver.pgp.com (ID: 0xCFADA4B7)