[Top][All Lists]

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

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

From: Larry Jones
Subject: Re: How to diff branch sandbox against tip of trunk?
Date: Mon, 5 Nov 2007 20:15:14 -0500 (EST)

Ted Stern writes:
> On 05 Nov 2007 12:46:02 -0800, Larry Jones wrote:
> >
> > 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.

Like I said, subsequent imports need to be more complicated.  That merge
wasn't in your original list of commands (and don't forget to "commit"
afterwards, too).  And after that merge, you still need to do ``admin
-b'' and ``update -A'' to handle any newly-added files.  If you were to
update to CVS 1.12 and use ImportNewFilesToVendorBranchOnly, you would
only need to do the merge.

-Larry Jones

Bad news, Mom.  I promised my soul to the Devil this afternoon. -- Calvin

reply via email to

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