Merging question - from and to

[Jeeva Sarma]

Hi
I have a question about merging. I thought merging
with two -j options was 'from' revision and 'to'
revision.
This is what happened in my working area from trunk.

I have a file soa.pc, branched out at 1.2, now at
revision 1.2.4.1 on branch, and 1.2 on trunk. I
check-out from trunk, then do

cvs update -j 1.2.4.1 -j 1.2 soa.p
Nothing happens.

I then tried

cvs update -j 1.2 -j 1.2.4.1 soa.pc

RCS file:
/cvsrep/cvsroot/ACE/ace/audit/care/soa/soa.pc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
Merging differences between 1.2 and 1.2.4.1 into
soa.pc

I also tried in another way, 

cvs update -j Br_CRMR2a_Dev soa.pc
Nothing.

Then
cvs update -j HEAD soa.pc
RCS file:
/cvsrep/cvsroot/ACE/ace/audit/care/soa/soa.pc,v
retrieving revision 1.2
retrieving revision 1.3
Merging differences between 1.2 and 1.3 into soa.pc

I don't understand how this works? Is the order
from-to or to-from or how are we supposed to give the
-j options? Pls clarify.

Thanks,
Jeeva


__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com