Stuart Donaldson writes:
>
> When using cvs import, and merging in conflicts, cvs reports that the
> way to merge the conflicts is with:
>
> cvs checkout -jVENDOR:yesterday -jVENDOR module
>
> However if I am importing multiple times to get several versions of a
> project into CVS, it seems this would break if I was doing it all the
> same day.
>
> Is there a better way to get several versions into CVS?
There's a better way in general. Each time you import, you supply a
release tag; you should use those release tags instead of the vendor tag
with the :yesterday modifier. So instead of the above, you'd do
something like:
cvs co -jRel2 -jRel3 module
where "Rel3" is the release tag for the version you just imported and
"Rel2" is the release tag for the previous version.
-Larry Jones
Let's just sit here a moment... and savor the impending terror. -- Calvin
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
