[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging two directory structures

From: Larry Jones
Subject: Re: Merging two directory structures
Date: Wed, 7 Nov 2007 15:51:56 -0500 (EST)

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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]