This is sort of OT, but not really.

We get packages from a vendor (some application), and they provide us updates periodically. At the same time, we make our own modifications to various modules. Obviously not ideal, but that is how life goes on.

Obviously we have to keep track of all the changes, and it is a given that cvs is the tool.

What's in my mind now, is to have a main branch, which we make changes to.

Every time we get a version from vendor, we create a new branch, and then merge this new branch back to the main branch (which includes our own changes). The merge then happens automatically for us, hopefully without conflict, although not much hope. But we can always resolve the conflicts.

Does anyone have a similar needs? What did you do?

---

---

Posts are HTML formatted. Put <p> </p> tags around your paragraphs. Put <code> </code> tags around your code and data!

Titles consisting of a single word are discouraged, and in most cases are disallowed outright.

Read Where should I post X? if you're not absolutely sure you're posting in the right place.

Please read these before you post! —

• How do I compose an effective node title?
• How do I post a question effectively?
• Markup in the Monastery

Posts may use any of the Perl Monks Approved HTML tags:

a, abbr, b, big, blockquote, br, caption, center, col, colgroup, dd, del, details, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, ins, li, ol, p, pre, readmore, small, span, spoiler, strike, strong, sub, summary, sup, table, tbody, td, tfoot, th, thead, tr, tt, u, ul, wbr

You may need to use entities for some characters, as follows. (Exception: Within code tags, you can put the characters literally.)

	For:		Use:
	&		&
	<		&lt;
	>		&gt;
	[		&#91;
	]		&#93;

Link using PerlMonks shortcuts! What shortcuts can I use for linking?

See Writeup Formatting Tips and other pages linked from there for more info.