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

Re: problems managing package with CVS



On Sat, Jan 13, 2001 at 11:34:35PM -0500, Matt Zimmerman wrote:
> On Sat, Jan 13, 2001 at 08:18:41PM -0500, Chris Ruffin wrote:
> 
> I don't understand why it suggests that you do this.  It is much more accurate
> to instead use:
> 
> cvs checkout -jupstream_version_old -jupstream_version_new <package>
> 

I think the two are equivalent if all you ever import into the tree is
upstream sources with the same vendor tag.  In fact, the same tutorial
gives the command you suggest as an alternative.

The solution to the original problem , as prompted from a previous
post, is to run cvs-co-upgrade, and execute those commands on the
tree.  This will clean up the cruft that accumulates when merging the
two source trees together.

From the cvs-upgrade man page:

       Please  look  at cvs-co-upgrade to see how to handle files
       and directories that may have been  added  to  or  deleted
       from  the  upstream  sources.  Combined with the companion
       utilities cvs-buildpackage and cvs-inject,  this  provides
       an  infrastructure  to facilitate the use of CVS by Debian
       maintainers. This allows one to keep separate CVS branches
       of a package for stable, unstable, and possibly experimen-
       tal distributions, along with the other benefits of a ver-
       sion control system.

I wonder why the author of these tools chose to leave cvs-co-upgrade
as a separate process.  It seems to me like it should be integrated
into cvs-upgrade.
--
Chris Ruffin <cmruffin@debian.org>

Attachment: pgpBnOz9QbM2K.pgp
Description: PGP signature


Reply to: