Murugaiyan, Natarajan [IT] writes:
>
> Is this problem [cvs -n update] fixed?
Not so far as I know, it's not easy to fix.
-Larry Jones
Mom would be a lot more fun if she was a little more gullible. -- Calvin
___
Info-cvs mailing list
Info-cvs@gnu.or
opher (6452)"
Cc: Info-cvs@gnu.org
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
"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
I thought this would be straight forward but for some reason I'm getting an
error when I try to merge my branch files to the trunk. I've done this 1000+
times...
I submitted all the changes to my branch, say b_dev; I renamed my branch
sandbox dir
from, say, proj to proj.b_dev
I checked out the la
