Hi Jim,

On May 6, 2004, at 12:59 PM, Jim.Hyslop wrote:

Geoff Beier wrote:
This is very easy to do... it's one of the easiest ways to
use CVS and
is an excellent application of the tool. Here's a quick
synopsis.
However, it does not address the issue that Jill will be using the same
source file in two different repositories, with two different histories. You
haven't addressed how she should keep the two properly in sync.


Sorry. That's a long topic. That's why I included the link to more extensive documentation. To do what Jill describes, I:

1. Bring in upstream changes as described here:
http://cvsbook.red-bean.com/cvsbook.html#Tracking_Third- Party_Sources__Vendor_Branches_


(if needed... depends on the nature of the project and whether changes go in upstream:)
2. Keep a checked out copy of the external repository alongside my own repository for looking at intermediate revisions (between my merges), log messages, etc.


There may be scripts floating around address this in a more automated fashion, but I've never looked into it because the above is easy and has met my needs.

Regards,

Geoff



_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Reply via email to