Re: How to diff branch sandbox against tip of trunk?

[Ted Stern]

On 05 Nov 2007 12:46:02 -0800, Larry Jones wrote:
>
> Ted Stern writes:
>> 
>> If the latest version of a file is 1.1.1.x, won't -r1 still retrieve
>> that version?
>
> No.  -r1 will only retrieve revisions of the form 1.x (exactly two
> components).
>
>> In any case, this is why I now recommend using 'cvs admin -b' to
>> change the default branch after an import:
>> 
>>         cvs -d /path/to/repos import -d modulename vendor-branchname tag
>>         cd /path/to/workdir
>>         cvs -d /path/to/repos checkout modulename
>>         cd modulename
>>         cvs admin -b
>>         cvs update -A
>> 
>> I find that the vendor branch still works just fine for updating
>> imports, and I don't have those irritating 1.1.1.1 versions on checked
>> out files.
>
> That works for an initial import, but subsequent imports (when you're
> tracking third-party sources) need to be more complicated or you won't
> get any of third-party changes.  It would be better to use CVS 1.12's
> ImportNewFilesToVendorBranchOnly=yes config option and always merge to
> the trunk instead.
>

That's odd.  I am finding that my subsequent imports work just fine.

I import to the vendor branch, then I use the helpful command provided
by the import:

 158 conflicts created by this import.
 Use the following command to help the merge:

    cvs -d /path/to/repos -j<prev_rel_tag> -j<cur_rel_tag> modulename

Everything seems hunky dory.  This is using version 1.11.17.

Ted
-- 
 dodecatheon at gmail dot com
 Frango ut patefaciam -- I break so that I may reveal