Re: Merging two directory structures

[Larry Jones]

Yves Martin writes:
> 
> When importing a structure on the vendor branch, your current head is
> not changed before you apply a merge on a working copy and then commit.

That is, unfortunately, not correct, unless you're using CVS 1.12 with
the ImportNewFilesToVendorBranchOnly option.  Otherwise, any files that
have never been locally modified *do* have their current head changed by
the import.

-Larry Jones

I've got more brains than I know what to do with. -- Calvin