In article <[EMAIL PROTECTED]>, Stuart Donaldson wrote:
>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.
That's correct.
>Is there a better way to get several versions into CVS?
Since each import is tagged, then you can obviously do the merge from
the previous tag:
cvs checkout -j previous_vendor_release_tag -j vendor
The vendor:yesterday is just a trick if you don't do more than one vendor
import in a day; then you don't have to look up what the last release
tag was.
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
