Tad Hunt writes:
>
> 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
At this point you need to do:
$ cvs checkout -jR1 -jR2 xxx
cvs checkout: Updating xxx
U xxx/file_in_r1
cvs checkout: scheduling xxx/file_in_r1 for removal
U xxx/file_in_r2
$ cd xxx
$ cvs ci -m'merge changes'
cvs commit: Examining .
Removing file_in_r1;
/tmp/cvstest/xxx/file_in_r1,v <-- file_in_r1
new revision: delete; previous revision: 1.1.1.1
done
-Larry Jones
I don't NEED to compromise my principles, because they don't have
the slightest bearing on what happens to me anyway. -- Calvin
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
