Jigomerge plugin

Skip to end of metadata
Go to start of metadata

Plugin Information

Plugin ID jigomerge Changes In Latest Release
Since Latest Release
Latest Release
Latest Release Date
Required Core
Dependencies
0.7
Jul 08, 2011
1.398
Source Code
Issue Tracking
Maintainer(s)
GitHub
Open Issues
Vincent Beretti (id: vberetti)
Usage Installations 2013-Apr 103
2013-May 107
2013-Jun 105
2013-Jul 100
2013-Aug 104
2013-Sep 98
2013-Oct 103
2013-Nov 98
2013-Dec 96
2014-Jan 101
2014-Feb 99
2014-Mar 101

This plugin adds the ability to directly merge Subversion branches in Jenkins. See http://code.google.com/p/jigomerge/

Configuration

Configure your Subversion repository in the Source Code Management section : this is the branch you want to merge to.

In the Build Triggers section, set a value in Build periodically. Do not use Poll SCM !  

Advice : The merge to be effective should be run as often as possible. For exemple set the Build periodically to every hour. This will prevent conflicts as much as possible.

In the Build section, choose Perform svn merge with Jigomerge.

3 fields are mandatory :

  • source : the repository you want to merge from
  • username : the username to merge with
  • password

Optional fields :

  • one by one : if checked, one commit per revision merge
  • eager : if checked, try to merge revisions even if a previous one is conflicting. Use with caution !

Usage

TBD

Roadmap

  • add the ability, from the report view, when a conflict occurs, to choose to
    • ignore a revision
    • choose which revision to keep to resolve the conflict

Changelog

Release 0.7 (2011-07-08)
Release 0.6 (2011-04-30)
Release 0.5 (2011-04-26)
  • update to jigomerge script 2.2.4
Release 0.3 and 0.4 (2011-04-19)
  • validation script was not persisted
Release 0.2 (2011-03-19)
  • handle unbreakable merge feature with parameter "validation script"
Release 0.1 (2011-03-13)
  • initial release
  • jigomerge-plugin 0.1 uses jigomerge in version 2.2.3 

Labels

Edit
plugin-builder plugin-builder Delete
Enter labels to add to this page:
Please wait 
Looking for a label? Just start typing.

Add Comment