Repository Merging

jarrodwl — Mon, 09 Jun 2008 16:28:17 GMT

Hi guys.I'm new to Alfresco and I'm very impressed with what I've seen to date, excellent work!!!My question:I'm currently evaluating many CMS' and one requirement I have is a means for supporting both a "Production CMS" and "Project(s) CMS". - The "Production CMS" environment will support the dail

Re: Repository Merging

pmonks — Mon, 09 Jun 2008 21:45:03 GMT

The repository itself does support branching and merging, but we've held off on exposing that functionality (particularly merging) in the UI until we have the time to develop a good merge UI. Branching is exposed in a limited fashion in the latest versions (v2.1.2+) - when creating a new Web Project you have the opportunity to use an existing Web Project as a template. Under the covers this is accomplished by creating a branch of the original Web Project (with the idea that it's more of a fork than a branch - the two Web Projects go their separate ways and aren't ever merged).

As for how to handle your requirement, here are a couple of ideas:

Collect the changes for each project in a single user sandbox and either hold off on submitting them until they're ready to be published or submit them with an effective date

Use a Web Project per project and then assemble the content together into a consolidated user experience in your delivery tier

Use a Web Project per project and then use the "create layer" function (v2.2+) to "mixin" the new content to your primary Web Project once it's ready for publication

Investigate calling the merge APIs yourself, using whatever merge tools you're comfortable with for handling merge collisions

Cheers,
Peter

topic Repository Merging in Alfresco Archive

Repository Merging

Re: Repository Merging