CVS help needed...

From: Tsantilas Christos <chtsanti@dont-contact.us>
Date: Sun, 06 Mar 2005 10:15:04 +0200

One question.
Assume that I want to merge the main branch s2_5 to icap-2_5 branch
If I am right, I must execute the followings:
 
      cvsmergeinit s2_5
      cvsmerge s2_5

  Make my changes and then execute:
  
   cvs commit

As I show the cvsmergeinit makes a tag to CVS e.g Z-icap-2_5_merge_s2_5
What if the tag already exists in CVS?
Must I simply deleted before cvsmergeinit?

Am I loosing something?

Thanks,
   Christos
Received on Sun Mar 06 2005 - 01:14:39 MST

This archive was generated by hypermail pre-2.1.9 : Fri Apr 01 2005 - 12:00:04 MST