Hi,
I have setup Eclipse not to use it's internal merging tool, and HG to use
P4Merge.
This way, the P4Merge UI is launched whenever I need to do a manual merge.
It is much better than the internal Eclipse merge tool.
Anyway, I have a timeout issue whenever this manual merge is complex and
requires
some time :
java.lang.Exception: Process timeout: hg -y merge ...
at
com.vectrace.MercurialEclipse.exception.HgException.<init>(HgException.java:49)
at
com.vectrace.MercurialEclipse.commands.AbstractShellCommand.executeToStream(AbstractShellCommand.java:425)
at
com.vectrace.MercurialEclipse.commands.AbstractShellCommand.executeToBytes(AbstractShellCommand.java:387)
at
com.vectrace.MercurialEclipse.commands.AbstractShellCommand.executeToString(AbstractShellCommand.java:605)
at
com.vectrace.MercurialEclipse.commands.AbstractShellCommand.executeToString(AbstractShellCommand.java:601)
at
com.vectrace.MercurialEclipse.commands.HgMergeClient.merge(HgMergeClient.java:34)
How could I disable these tiomeout, or setup a greater timeout value ?
Thanks in advance,
Raphael Jolivet
--
You received this message because you are subscribed to the Google Groups
"MercurialEclipse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
