Problem in CVS merge

[edalquinn]

Hi,

I have some problem in CVS merge.
I have a file "a.c" which has the graph as below,

1.1-----> (branch_01)1.1.2.1
  |
  |
1.2

My local repository is updated with version 1.2.
I try doing a merge with the following command,

cvs update -j branch_01 a.c
cvs commit -m "Included branch_01"

The new 1.3 version file is same as the branch(1.1.2.1), the changes
in 1.2 are lost.

>From documents I found the expected behavior is, the difference
between 1.1.2.1 and 1.1
should get merged with 1.2 and we get a file with newer version.

Please guide me on how it works.

Thanks,
Mina.