[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: How to merge with my cvs

From: Jerry Nairn
Subject: RE: How to merge with my cvs
Date: Thu, 13 Dec 2001 12:29:41 -0800

> From: Sasha Case [mailto:address@hidden
> Sent: Wednesday, December 12, 2001 5:16 PM

> 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.

This is a good method. I've had to do something similar, and I'd like to
recommend a couple more steps.

> 1. Checkout a copy of the module based on date/time using -D. 
>  Use the date 
> that you gave him the files.

1a. Delete all of the files except the files in the CVS directories. You
retain all of the cvs information, but get rid of the files you checked out.

> 2. Copy his changed files over to the checked out copy.

2a. Run "cvs -nq up" on this workspace.
? indicates something added.
U indicates something he removed.
M indicates something he modified.

2b. Unless you have a reason not to, "cvs add" the new files. The removed
and modified files can be handled by merging.

> 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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]