I switched to subversion a while ago just for ease of branching and merging. But, I also needed compatibility with CVS-based hosting services (like SourceForge), so I wrote svn2cvs. With cvs2svn and this tool I made successfull transition to subversion.

Vendor branches in subversion are just directories. Basic principle is following: You have version 1.0 of vendor (upstream) branch. You do copy (which is cheap in subversion) to your trunk (current working tree). When vendor release version 1.1, you do merge. Subversion will diff vendor version 1.0 and 1.1 and apply changes to your working tree. If there are conflicts, you will get original file, left and right merge, just to make it easier. All that is described in much more details in subversion book.

I must also warn you: if you try subversion branches, you won't be able to go back to CVS :-)


2share!2flame...

In reply to Re^3: (sort of OT) cvs/vendor supplied modules/our own modifications by dpavlin
in thread (sort of OT) cvs/vendor supplied modules/our own modifications by pg

Title:
Use:  <p> text here (a paragraph) </p>
and:  <code> code here </code>
to format your post, it's "PerlMonks-approved HTML":


  • 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! —
  • 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:
    & &amp;
    < &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.