[Top][All Lists]

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

Re: Problem in merge in cvs

From: Rohan Nandode
Subject: Re: Problem in merge in cvs
Date: Sat, 14 Aug 2004 20:26:23 +0530
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.1) Gecko/20020830

Hi Ramanuj

I am facing a wierd problem. There is a branch on main trunk i.e. dev branch. In this branch different developer create their branches and merge their each branh into main trunk after completing their task.

I don't think this idea would work as it is.

Developers are using Tortoise CVS as their tool. When a developer merges his branch after one developer has already merged his branch into dev branch instead of file getting update with the another merge get overridden by the file of last developer who has merged the file.

The problem would always occur. The reasoning is that both developers create branch from one version and then first devel. commits its changes to trunk. But second devel would not have these changes in his copy. So when he tries to merge the file into trunk, CVS would think that in the new version those changes are removed and would remove them in new version.

This problem can also occur when one commits his changes without updating his local copy.

One solution would be that each developer keeps merging regularly (or whenever other devel. merges his changes to trunk) the TRUNK into his branch so that his branch is updated and in sync with the Trunk.


reply via email to

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