CVS files merging procedure

[abhay mehta]

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.

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.

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.

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?

2. Is there any problem is merging procedure and if any, what should be the correct way to do it?

Thanks in advance.

Abhay
 

---

Yahoo! Shopping
 
Find Great Deals on Holiday Gifts at Yahoo! Shopping