Re: Merging two directory structures

[Yves Martin]

On Wed, 2007-11-07 at 15:51 -0500, Larry Jones wrote:
> 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.

Oh ? I have never take care to this option.

Usually, when I do an import and then a merge on the head from a vendor
branch, new files are marked locally for addition before commit... So
for me, the head is not modified before merge.

It was long ago; I have to check again with new Debian cvs 1.12.13 -
maybe this convenient option "ImportNewFilesToVendorBranchOnly" is
default in Debian compilation.

-- 
Yves Martin