Beefy Boxes and Bandwidth Generously Provided by pair Networks
Syntactic Confectionery Delight
 
PerlMonks  

Re^3: (sort of OT) cvs/vendor supplied modules/our own modifications

by dpavlin (Friar)
on Jul 25, 2004 at 22:03 UTC ( [id://377312]=note: print w/replies, xml ) Need Help??


in reply to Re^2: (sort of OT) cvs/vendor supplied modules/our own modifications
in thread (sort of OT) cvs/vendor supplied modules/our own modifications

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...
  • Comment on Re^3: (sort of OT) cvs/vendor supplied modules/our own modifications

Log In?
Username:
Password:

What's my password?
Create A New User
Domain Nodelet?
Node Status?
node history
Node Type: note [id://377312]
help
Chatterbox?
and the web crawler heard nothing...

How do I use this?Last hourOther CB clients
Other Users?
Others musing on the Monastery: (4)
As of 2024-06-21 21:50 GMT
Sections?
Information?
Find Nodes?
Leftovers?
    Voting Booth?

    No recent polls found

    Notices?
    erzuuli‥ 🛈The London Perl and Raku Workshop takes place on 26th Oct 2024. If your company depends on Perl, please consider sponsoring and/or attending.