thanks Mathieu
jp
Mathieu MARACHE wrote:
Hi jp,
Sorry didn't see this earlier. Yes you can use meld within svn,
provided you use a script like described here :
http://svnbook.red-bean.com/en/1.4/svn.advanced.externaldifftools.html
here is the script I reproduced from here :
http://article.gmane.org/gmane.comp.gnome.meld.general/362
------------------------ Start: svn-diff-meld
#!/bin/sh
# SVN Diff Wrapper for Meld
# KOG 2008-02
left="$6"
right="$7"
meld "$left" "$right"
------------------------ End: svn-diff-meld
Then adapting it to diff3
------------------------ Start: svn-diff3-meld
#!/bin/sh
# SVN Diff3 Wrapper for Meld
mine="$9"
older="$10"
yours="$11"
meld "$mine" "$older" "$yours"
------------------------ End: svn-diff3-meld
then modifying your ~/.subversion/config with these values should do the trick
[helpers]
diff-cmd = ABSOLUTE_PATH_TO/svn-diff-meld
diff3-cmd = ABSOLUTE_PATH_TO/svn-diff3-meld
diff3-has-program-arg = false
HTH
--
Mathieu
2008/11/27 J.P. Delport <[EMAIL PROTECTED]>:
Hi,
Paul Melis wrote:
J.P. Delport wrote:
Hi,
Mathieu MARACHE wrote:
Do you know if meld can integrate nicely with svn? E.g. I can do
svn diff
svn merge
on command line and then it brings up xxdiff. Can meld do this (be an
diff app for svn)? If it can I will definitely try.
There does seem to be the environment variable SVN_MERGE that subversion
looks at, but I'm not sure if that one has only been introduced in a very
recent subversion release.
I usually set diff-cmd and diff3-cmd in ~/.subversion/config
to xx-diff-proxy. I was wondering if meld had something similar?
jp
Regards,
Paul
--
This message is subject to the CSIR's copyright terms and conditions, e-mail
legal notice, and implemented Open Document Format (ODF) standard. The full
disclaimer details can be found at http://www.csir.co.za/disclaimer.html.
This message has been scanned for viruses and dangerous content by
MailScanner, and is believed to be clean. MailScanner thanks Transtec
Computers for their support.
_______________________________________________
osg-users mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
_______________________________________________
osg-users mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
--
This message is subject to the CSIR's copyright terms and conditions, e-mail legal notice, and implemented Open Document Format (ODF) standard.
The full disclaimer details can be found at http://www.csir.co.za/disclaimer.html.
This message has been scanned for viruses and dangerous content by MailScanner,
and is believed to be clean. MailScanner thanks Transtec Computers for their support.
_______________________________________________
osg-users mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
