Merge issues.

2004-11-22 Thread Tawfik, Sameh E
Hi, About a month ago I tagged the main line with Release_2_2_0 tag, and then from that tag I made a new branch Release_2_2_0_Branch. Now, Im trying to merge from the branch to the main line, but it seems either Im using the wrong syntax to the update command or there is a bug in

Merge question?

2004-11-19 Thread Tawfik, Sameh E
My CVS client is on Widows XP Professional version 2002 with SP1. I need to merge a branch to the trunk, and since we have binary files in both places, I thought of performing the following steps to avoid merging the binary files: 1. From the trunk sand box, run the following