I have 2 branches "r56b0" and "r56b0_branch_demo" other than the "main".
"r56b0_branch_demo" was branched off from "r56b0" at tag id : "build15".
"r56b0" is now at a tag level "build20".
I merged
changes made between "build15" to "build20"
on "r56b0"
into
"r56b0_branch_demo"
using
"cvs upd
Viraj Purang writes:
>
> The merge seems to be okay for most of the files,
> except the 2 new directories
> which were added to main and "r56b0"
> between "build15" and "build20" tags.
You need to use update -d to get new directories.
-Larry Jones
Nobody knows how to pamper like a Mom. -- C
Thanks for the suggestion.
It worked for me.
Very prompt response.
Regards,
Viraj Purang
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Sent: Thursday, February 05, 2004 2:13 PM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: Re: CVS update -j problem with
