info-cvs
[Top][All Lists]
Advanced

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

RE: CVS files merging procedure


From: Wiest, Damian
Subject: RE: CVS files merging procedure
Date: Fri, 9 Dec 2005 11:09:17 -0600

> -----Original Message-----
> From: abhay mehta [mailto:address@hidden 
> Sent: Thursday, December 08, 2005 10:38 PM
> To: address@hidden
> Subject: CVS files merging procedure
> 
> 
> Hi,
> 
> I am using CVS version 1.11.14 on Suse Linux 9.1 to manage my 
> project. Two programmers are working on this project. I have 
> few problems/queries related to project merging:
> 
> 1. Programmer A (PA) extracted project version dtd. 17 Nov 
> 2005 for changes. One file for change was resutil.c. Same 
> version was extracted by Programmer B (PB) for his set of changes.
> 
> 2. After making changes, PA submitted his set of files for 
> merging to Administrator (Adm) on 21 Nov 2005. Modification 
> date of file resutil.c was 20 Nov 2005. 

Why is PA sending Adm the files?  Shouldn't PA just commit them to CVS
himself?
 
> 3. Adm extracted latest version of project i.e. dtd 17 Nov 
> 2005, copied set of files given by PA to respective 
> directories and performed commit. A new revision (dtd 20 Nov 
> 2005) was created.

Okay so far, even though I think your procedure is questionable.  The whole
point of CVS is to allow for concurrent, distributed development.
 
> 4. After making changes, PB submitted his set of files for 
> merging to Administrator (Adm) on 23 Nov 2005. Modification 
> date of file resutil.c was 19 Nov 2005. 
> 
> ! 5. Adm extracted latest version of project i.e. dtd 20 Nov 
> 2005, copied set of files given by PB to respective 
> directories and performed commit. A new revision was created.

Not okay.  What you've just done is to overwrite PA's changes.
 
> My queries are:
> 
> 1. Why CVS allowed merging, even when old file dtd. 19 Nov 
> 2005 (of PB) was updated on file dtd. 20 Nov 2005 (of PA). 
> Whether it checks file timestamps or not?

Unless I'm missing something you're not merging anything, you're overwriting
changes.
 
> 2. Is there any problem is merging procedure and if any, what 
> should be the correct way to do it?
> 
> Thanks in advance. 
> 
> Abhay

The typical procedure would be for PA to commit his changes and then PB
commits his changes (or vice versa).  If PB happened to change any of the
lines that were modified by PA, then PB would resolve the conflicts and
recommit.

If you really want Adm to resolve conflicts, then you should consider
creating separate branches for PA and PB to work with; these branches would
only contain the files they're working on.  PA and PB would commit their
changes to their respective branch.  At this point, Adm would be responsible
for merging PA's changes to the main development branch and commit, followed
by a merge of PB's changes.

It seems to me that you have a fundamental misunderstanding  of how CVS
works, I'd suggest reading the manual.

-Damian




reply via email to

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