[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Modifying 3rd Party Code

From: Greg A. Woods
Subject: Re: Modifying 3rd Party Code
Date: Wed, 17 Jan 2001 15:10:45 -0500 (EST)

[ On Tuesday, January 16, 2001 at 12:09:12 (-0500), Larry Jones wrote: ]
> Subject: Re: Modifying 3rd Party Code
> The suggested command assumes you won't import more than one vendor
> release per day, which you have.  It is much safer to use the release
> tags instead, and that will avoid this problem:
>       cvs checkout -jR1_0 -jR1_2 testapp


There are also other hard-to-identify scenarios where use of
":yesterday" fails miserably (I think only to do with added and removed
files, but, as I say, the scenario is hard to identify and I don't have
a concrete recipie for reproducing the problem -- I only know that I've
tripped over inexplicable problems even with the most recent CVS from
the repo).

In fact this needs to be said so often that I think this is
long past needing to be fixed, which leads me to:

> (CVS doesn't have any way to know what they are, which is
> why it can't suggest them)

Well, it does know exactly what one of them is (it's the one specified
on the currently running "cvs import" command line!), and it can very
well guess what the other might be (which isn't really that hard to do
if you simply look for the "top" tag on the VENDOR branch in the first
file you encounter), or it could just say something like (this is a
literal example using the tags and module names from the original

        U testapp/file1.txt
        U testapp/file2.txt
        C testapp/file3.txt
        U testapp/file4.txt

        1 conflicts created by this import.

        Use the following command to begin the merge procedure:

                cvs checkout -j<last-vendo-release-tag> -jR1_2 testapp

        (NOTE: replace "<last-vend-reltag>" with the previous vendor
        release tag on the VEND branch.)

It should also be noted that a merge *must* be done after every import
if you want everything to go well, especially when files are added and
removed in the vendor release.

It might also be noted that one can just as well do a merge in any
existing working directory by replacing "checkout with "update" and
"testapp" with "." (or maybe nothing, though I've had problems even
recently if I don't explicitly specify ".").

                                                        Greg A. Woods

+1 416 218-0098      VE3TCP      <address@hidden>      <robohack!woods>
Planix, Inc. <address@hidden>; Secrets of the Weird <address@hidden>

reply via email to

[Prev in Thread] Current Thread [Next in Thread]