[Top][All Lists]

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

Merge question?

From: Tawfik, Sameh E
Subject: Merge question?
Date: Fri, 19 Nov 2004 12:38:49 -0800

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 command:


            cvs update -j Release_2_2_0  -j Release_2_2_0_Branch


After the above command is done, I’ll make a list of all the modified file by checking the “.#” files.


2.      I’ll update the trunk files by putting them back to their original state before the merge.


3.      Based on the list I made earlier, I’ll run the following command only on the files that needs to be merged:


            cvs update -kk -j Release_2_2_0  -j Release_2_2_0  filename


My questions are:


Q1. Is the above is the best method to use to handle the merge between branches when there are binary files that should NOT be merged?


Q2. After I merge the text files using the “-kk”, do I need to reset the merged files to remove “-kk” option?





reply via email to

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