Yes I try to rename the file, but I have the same error.
I think my problem is just "how to install svnmerge". Because when I type svnmerge in terminal, I've got this : "svnmerge: command not found"
On Fri, Jul 25, 2008 at 1:39 AM, Luke Daley ld@ldaley.com wrote:
On 24/07/2008, at 7:31 PM, Cedric Simon wrote:
I don't know how to install SVN_MERGE, can you help me ?
When I click on "Show available revisions for merging", I have this message : "Couldn't find svnmerge If you have installed svnmerge, then you need to either update your PATH or set the TM_SVNMERGE shell variable"
I try with Svnmerge.py (http://www.orcaware.com/svn/wiki/Svnmerge.py), and I added the path in shell variable, but it doesn't work.
When you installed, did you drop the .py from the end of the script? Because the svn bundle is looking for a command named 'svnmerge', not 'svnmerge.py'.
Also, the next svn bundle is probably going to drop support for svnmerge and use svn 1.5s native merge tracking facilities. Specifically for the purpose of avoiding confusion like this.
--
LD.
textmate mailing list textmate@lists.macromates.com http://lists.macromates.com/listinfo/textmate