Hi,
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.
Thanks,
Cedric
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.
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
Oh, did you make the script executable?
chmod +x svnmerge
--
LD.
On 25/07/2008, at 6:47 PM, "Cedric Simon" ced@64k.be wrote:
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
textmate mailing list textmate@lists.macromates.com http://lists.macromates.com/listinfo/textmate
It was that, it works know !
Thanks
Cedric
On Fri, Jul 25, 2008 at 1:33 PM, Luke Daley ld@ldaley.com wrote:
Oh, did you make the script executable?
chmod +x svnmerge
--
LD.
On 25/07/2008, at 6:47 PM, "Cedric Simon" ced@64k.be wrote:
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
textmate mailing list textmate@lists.macromates.com http://lists.macromates.com/listinfo/textmate
textmate mailing list textmate@lists.macromates.com http://lists.macromates.com/listinfo/textmate
On Jul 25, 2008, at 3:47 AM, Cedric Simon wrote:
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"
Also make sure you put the file in somewhere in your PATH and have PATH setup correctly.
Hello,
If a file svnmerge exists then navigate via terminal to its folder and type ./svnmerge, it should work. You can also put it in one of your $PATH folders, type echo $PATH in terminal to see thoses separated by colons and put the file in one. You can add a path via .profile: have a look at the .profile file, it's a hidden file in you home folder. To go to your home folder just type cd and return .. expecting you use bash on Leopard .. If it does not work (or says no right to do that) ls -l svnmerge to see if it has an x as execute on his rights infos, if not chmod +x svnmerge.
hth
Le 25 juil. 08 à 10:47, Cedric Simon a écrit :
"svnmerge: command not found"
-
Cedric Simon -
Cedric Simon -
L. Demaret -
Luke Daley -
Michael Sheets