[Top][All Lists]

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

Re: Merging third party source

From: Larry Jones
Subject: Re: Merging third party source
Date: Fri, 12 Jul 2002 11:26:36 -0400 (EDT)

Fredrik Svensson writes:
> I taged the tree as before_NEWVERSION

What what revisions did you tag?  I'm assuming you tagged the most
recent revisions on the trunk.

> unpacked the new sources.
> I imported the new sources as described in the manuals, with
> the tag NEWVERSION.
> cvs -q import project Company NEWVERSION
> I then did the
> cvs checkout -j before_NEWVERSION -j NEWVERSION project

If so, that's completely wrong.  It's almost certainly wrong no matter
what.  The first tag should be the revision tag you used the last time
you imported the source, not a new tag you made up somewhere along the
line.  The bottom line is that you want to merge all the (third party)
changes between the previous import and this import into the trunk.

-Larry Jones

The real fun of living wisely is that you get to be smug about it. -- Hobbes

reply via email to

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