Re: merging from HEAD into a branch?

[Jean-Christian Imbeault]

Rohan Nandode wrote:

> Try cvs update -d -jHEAD

Tried, it didn't change anything.

$ cvs -nq update -d -jHEAD
RCS file: /repos/MRW/mizuhoApp/src/com/mizuho/rws/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into build.xml
cvs update: build.xml: No such file or directory
[There should be a dir called fi being found too ...]

Jc

Again, don't mind the nasty disclaimer
Note: This e-mail contains privileged and confidential information and is for 
the sole use of the intended recipient(s).  If you are not an intended 
recipient, you are hereby kindly requested to refrain from printing, copying, 
or distributing the information contained herein.  Furthermore, any other use 
of the information contained herein is strictly prohibited.  If you have 
received this transmission in error, please kindly notify the sender 
immediately and destroy all copies of the original message.