[Top][All Lists]

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

Re: Vendor Tags etc.

From: Larry Jones
Subject: Re: Vendor Tags etc.
Date: Thu, 15 Feb 2001 10:53:49 -0500 (EST)

Robert Longworth writes:
> My question boils down to this, if I have three directories of source code
> called (say)
> Program1.0/
> Program1.0-tweeked/
> Program1.1/
> where 1.0 and 1.1 are the non-modified versions of the source, how do I go
> about merging the changes made to 1.0 into 1.1, bearing in mind none of the
> source files are in the repository yet?

There isn't any easy way to do that.  What I would do is import
Program1.0 and then check it out into a working directory.  Then, either
copy all of the Program1.0-tweeked files over top of the working
directory or copy the CVS directories from the working directory into
the Program1.0-tweeked directory, and commit.  Then import Program1.1
and follow the usual procedures for importing a new vendor release.  The
key is to *not* import Program1.0-tweeked because it's local changes,
not a vendor release.

-Larry Jones

That's one of the remarkable things about life.  It's never so
bad that it can't get worse. -- Calvin

reply via email to

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