What steps will reproduce the problem? 1. launch the program, whatever the options and the workspace

What is the expected output? What do you see instead? Expected to merge a branch on another, but instead the script blocks on command 'svn status --xml'

[DEBUG] executing command 'svn --non-interactive --username XXX --password XXX revert -R .' [DEBUG] exit value : 0 [DEBUG] executing command 'svn --non-interactive --username XXX --password XXX update' [DEBUG] BEGIN command output : [DEBUG] À la révision XXX. [DEBUG] END command output [DEBUG] exit value : 0 [DEBUG] executing command 'svn status --xml' [DEBUG] executing command 'svn --non-interactive --username XXX --password XXX mergeinfo --show-revs eligible XXX .' [DEBUG] exit value : 0 Merging 3 revisions ... Handling revision XXX ... [DEBUG] executing command 'svn --non-interactive --username XXX --password XXX log --xml -r XXX XXX' [DEBUG] exit value : 0 [DEBUG] executing command 'svn --non-interactive --username XXX --password XXX --accept postpone merge -c XXX XXX .' [DEBUG] BEGIN command output : [DEBUG] --- Fusion de XXX dans 'XXX': [DEBUG] U XXX [DEBUG] --- Fusion de XXX dans '.': [DEBUG] U XXX [DEBUG] END command output [DEBUG] exit value : 0 [DEBUG] executing command 'svn status --xml'

What version of the product are you using? On what operating system? jigomerge 2.2, GNU/Linux Ubuntu 10.10

Please provide any additional information below. changing this : protected def svnStatus(String options) { return executeCommand('svn status ' + options) }

to : protected def svnStatus(String options) { return executeCommand('svn status ' + options, false) }

fix the problem ;)

Hi, Was the revision merged on the previous command a large revision impacting a large number of files ? We can not applied the patch submitted because if status is long to finished, jigomerge will continue its execution before status has finished.

The problem is due to "full output buffer". I've patched the version 2.2 into a 2.2.2 version. This will fix your problem. Thanks for the bug report :)