RE: Branch to trunk merge error - help pls!

[Murugaiyan, Natarajan [IT]]

Is this problem fixed? I am seeing this problem with
cvs versions 1.11.6, 1.11.16 in solaris 8 platform?

Natarajan Murugaiyan(Ravi)

-----Original Message-----
From: address@hidden
[mailto:address@hidden
Behalf Of Larry Jones
Sent: Tuesday, April 13, 2004 8:54 PM
To: "Fouts Christopher (6452)"
Cc: address@hidden
Subject: Re: Branch to trunk merge error - help pls!


"Fouts Christopher (6452)" writes:
> 
> I now do a "cvs -nq update -j HEAD -j b_dev proj" (-nq just to see if it
> works) and I get
> 
> cvs server: file1.cpp: No such file or directory

Checkout and update don't work right with the global -n option,
particularly when doing merges.

-Larry Jones

I don't want to learn this!  It's completely irrelevant to my life! -- Calvin


_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs