RE: merging from HEAD into a branch?

[Christopher.Fouts]

The -n options means "don't really do it"


>-----Original Message-----
>From: address@hidden 
>[mailto:address@hidden
>] On Behalf Of Aldo TENDRON
>Sent: Friday, October 29, 2004 4:57 AM
>To: address@hidden
>Subject: Re: merging from HEAD into a branch?
>
>
>
>> $ 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
>
>I have the same 'problem' a few days ago. But if I remove the 
>'-n' option, it works fine for me. I dont't know why.
>
>-- 
>Aldo Tendron
>
>
>_______________________________________________
>Info-cvs mailing list
>address@hidden
>http://lists.gnu.org/mailman/listinfo/info-cvs
>