jigomerge


Automatic Subversion Merge Tool

jigomerge is a tool to automate revisions merging in a subversion repository

Branching and merging in Subversion have a bad reputation. Before or once a branch is created, we always wonder how we will merge back the changes to trunk or who will do this (the merge-martyr). Sometimes we may even let the branch die because it is too hard to reintegrate changes.

What if merge was as easy as a single setup on branch creation.

This tool is based on : * Groovy * Subversion


News


July 8th, 2011

Jigomerge 2.2.6 and Jigomerge Jenkins plugin 0.7 have been released. It fixes issues http://code.google.com/p/jigomerge/issues/detail?id=9'>#9, http://code.google.com/p/jigomerge/issues/detail?id=10'>#10 and http://code.google.com/p/jigomerge/issues/detail?id=15'>#15.


April 30th, 2011

Jigomerge 2.2.5 has been released. It fixes a problem when running in the https://wiki.jenkins-ci.org/display/JENKINS/Jigomerge+plugin'>jenkins plugin : http://code.google.com/p/jigomerge/issues/detail?id=6'>Issue 6.


April 26th, 2011

Jigomerge 2.2.4 has been released. It contains 1 fix for issue http://code.google.com/p/jigomerge/issues/detail?id=7'>7 and 1 enhancement http://code.google.com/p/jigomerge/issues/detail?id=4'>4.


March 11th, 2011

Jigomerge 2.2.3 has been released. It contains 2 fixes for issues http://code.google.com/p/jigomerge/issues/detail?id=2'>2 and http://code.google.com/p/jigomerge/issues/detail?id=3'>3.

Thanks to Benoit Guerin for submitting the fixes.


March 8th, 2011

Jigomerge 2.2.2 has been released. It contains a fix for https://code.google.com/p/jigomerge/issues/detail?id=1'>Issue 1 : http://code.google.com/p/jigomerge/issues/detail?id=1'>http://code.google.com/p/jigomerge/issues/detail?id=1.

It also contains technical refactoring to prepare a plugin for http://jenkins-ci.org/'>Jenkins.


March 1st, 2011

Jigomerge 2.2 is available for download. Using a "-V" option, you can provide a validation script that will be executed before jigomerge commits the merged revisions. If script execution fails, no commit is done.

Example : groovy jigomerge.groovy -V "mvn clean install"


January 31th, 2011

Jigomerge 2.1.1 is available for download. This version has a minor fix where it was no longer possible to launch jigomerge without authentication.


January 16th, 2011

Jigomerge 2.1 is available for download. This version handles authentication and has a new verbose mode. Old and deprecated version working with svn 1.4 has been fully removed.

Warning : options have changed. See http://code.google.com/p/jigomerge/wiki/Tutorial'>Tutorial documentation page for updated option list.


December 11th, 2010

Thanks to Fabien Arrault, Jigomerge 2.0 is now fully compatible with Subversion 1.5+. If you keep using Subversion 1.4-, keep Jigomerge 1.0 or use Jigomerge 2.0 with "-o" option.


Project Information

Labels:
Subversion Groovy Svn Svnmerge jenkins