[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: [Q] Vendor Branches and Updates
From: |
Jim.Hyslop |
Subject: |
RE: [Q] Vendor Branches and Updates |
Date: |
Fri, 19 Mar 2004 16:42:11 -0500 |
John Muller wrote:
> Supposed we have two files from a module (file1 and file2).
> file1 has been locally modified, but file2 has not.
> If I attempt to merge both of these files (in one import
> command). What happens to file1?
> 1) Does it become the head revision automatically?
> 2) Or does it have to be merged to become the head?
> I would expect #2 to happen to prevent the main branch from
> getting partial updates, but based on the cvs documentation
> (see below) I'm not sure if this will happen. Can someone
> clarify this?
Let me give you a hint: set up a section of your repository that is reserved
for testing, for example $CVSROOT/cvs-test.
Nothing in that section of the repository should be considered in any way
important, and the cvs-test directory can be blown away at any time.
Now, try it out and see what happens.
--
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)