Can I finally use CVSup to merge the changes made in the branch to the base development line?
No, CVSup can be used to replicate the changes made in the branch on its master server to the slave servers. • Why is it not possible, that two developers working on different hosts in the network check out the same developmentline from their host and commit changes on it? The concept of master servers in DCVS allows the distribution of changes on development lines throughout the entire server network without the risk of conflicts. By assigning r/w permission according to the branch ownership DCVS makes sure that data transfers do not corrupt the state of the replicated repositories. Otherwise it would be possible that developers check out the same branch on two different servers at the same time. They would accomplish modifications to the branch and when checking in or, as therepositories of the DCVS system must not permanently be connected, at least when synchronizing the repositories a conflict would arise which could not be resolved. To avoid this situation DCVS knows the branch ow
