[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
I'm confused by vendor branch behavior
From: |
Tad Hunt |
Subject: |
I'm confused by vendor branch behavior |
Date: |
Tue, 03 Apr 2001 17:47:35 -0700 |
I have two vendor releases, call them R1 and R2. I've
imported both of them. R1 contains file f1 and R2 contains
file f2 (but not f1).
When I do a "cvs checkout", I get both f1 and f2. How do I
cause the cvs checkout to only give me the files in R2?
Here's a contrived example:
$ mkdir xxx
$ cd xxx
$ touch file_in_r1
$ cvs import -m 'import #1' xxx XXX R1
N xxx/file_in_r1
No conflicts created by this import
$ rm -f file_in_r1
$ touch file_in_r2
$ cvs import -m 'import #2' xxx XXX R2
N xxx/file_in_r2
No conflicts created by this import
$ cd ..
$ rm -rf xxx
$ cvs checkout xxx
cvs server: Updating xxx
U xxx/file_in_r1
U xxx/file_in_r2
$
In reality, my two vendor releases are the NetBSD-1.4.3 and NetBSD-1.5
kernel source trees. Several files have either been removed or
renamed between the two releases. When I checkout the tree, I get
files that no longer exist in NetBSD-1.5.
Thanks
-Tad
- I'm confused by vendor branch behavior,
Tad Hunt <=