On 07/06/2012 04:17 AM, Michaël Pailloncy wrote:
I would like to compare file line by line and merge part of them [...]. This
plugin will allow me to apply some modifications directly without repeating
manual actions
in the production environment [...]
At the low level, this is a task best handled by version control. Reinventing
three-way merge is not a good use of your time.
Whether done as a plugin or directly via some scripts run on the two Jenkins masters, you would want to set up a baseline repository, e.g. using Git, which manages
*/config.xml and so on for the first draft of the staging master. Now copy that repository to the production master, make the minimal changes needed to reflect the
production environment (such as a different "Jenkins URL"), and commit the result to a 'production' branch. In the future, when making job or general configuration
changes in the staging master, commit those to a 'staging' branch; pull the branch over to the production master and merge 'staging' into 'production'.
