Merge content using a CLT

Hi,

I have the same content in two different branches which keeps changing. At a given point in time I need to merge them. Is there a way of doing the merge using a CLT.

Scenario :

abc.html content in the PRODUCTION : this keeps changing

abc.html content in DEV : has new content with a new functionality.

On the release day I need to merge both these content into the PRODUCTION branch.

Any ideas ?

Thanks
Ravi

Find more posts tagged with

Comments

13adam13

I cannot think of a CLT that will know which lines of code are supposed to exist in each file after the merge. Using the UI tool to compare the two files would be my recommendation.
Just submit the PROD version, then add the DEV version to the workarea and compare to staging.

raviswamy

Thanks Adam.

Guess I will have to do just that. I was looking for a CLT as there would be many many files to be merged and doing it using the GUI would be really time consuming.

13adam13

The problem with automating the process is that it can't know what to keep from each file.
If you knew something like "Lines 26-54 from DEV should replace lines 22-24 in PROD", then you could script it, but I didn't get the impression that was the case.

raviswamy

Yep ... it will have to be manual chagnes then. While on the subject,

I am doing a unix diff on these two files;
diff /DEV/abc.html /PROD/abc.html - this tell me that there is a conflict.

What i would have loved to have was which files has changed. Can we capture that ?

ex : /DEV/abc.html = this is a test.
/PROD/abc.html = this is a test demo.

In the above we know that PROD has changed. Can capture this in any way.

The reason being that, if thats the case I can ignore all the pages that is changed only on PROD and treat the DEV as new files.

Am I being clear ?

Thanks
Ravi

13adam13

so, you would want a way to know if a file on production or dev has more than one version?

iwattrib /DEV/abc.html editioncount

or, you would want to know which was last modified, prod or dev?

iwattrib /DEV/abc.html moddate

Adam Stoller

so, you would want a way to know if a file on production or dev has more than one version?
iwattrib /DEV/abc.html editioncount
or, you would want to know which was last modified, prod or dev?
iwattrib /DEV/abc.html moddate

editioncount is for branches
revisionnumber is for files ...