I want to configure it so that svn diff filename shows the diff in beyond compare.
I am on ubuntu. On a related note what is everyone using to diff and merge. BC is awesome on windows, but very ugly looking on Linux, imo.
+1
A:
See the SVN Book on External Diff Tools:
The presence of
--diff-cmdand--diff3-cmdoptions, and similarly named runtime configuration parameters (see the section called “Config”), can lead to a false notion of how easy it is to use external differencing (or “diff”) and merge tools with Subversion. While Subversion can use most of popular such tools available, the effort invested in setting this up often turns out to be non-trivial....
The key to using external diff and merge tools (other than GNU diff and diff3, of course) with Subversion is to use wrapper scripts which convert the input from Subversion into something that your differencing tool can understand, and then to convert the output of your tool back into a format which Subversion expects—the format that the GNU tools would have used. The following sections cover the specifics of those expectations.
Joey
2009-10-21 07:00:39
+1
A:
Definitely a fan of Beyond Compare, as it not only serves as a very good diff/merge tool for use with source control, it does a very good job of helping to synchronise directories/files in general. An absolute no-brainer, when it comes to buying a copy - can't vouch for the Linux version, though, as I've never used it.
belugabob
2009-10-21 07:06:02
"How to use beyond compare as a external svn diff tool"?
sbi
2009-10-21 08:40:55
I think it was referring to "On a related note what is everyone using to diff and merge." which, if you insert proper punctuation gets another question.
Joey
2009-10-21 08:43:13
In the Windows world, Araxis Merge was my preferred visual diff application (way better than Beyond Compare IMO). But under GNU/Linux, why would I use something else than Meld?
Pascal Thivent
2009-10-21 16:48:38
"On a related note what is everyone using to diff and merge" !?
belugabob
2009-10-22 13:17:47
I'm sorry. I removed my down-vote.
sbi
2009-10-22 14:33:43
No problem, we've all read things too quickly - must be the desire to post the first answer/comment ;-)
belugabob
2009-10-23 07:00:12
@belugabob: Please read my second-to-last comment at http://stackoverflow.com/questions/1601457/1601490#1601490
sbi
2009-10-23 08:51:30
+1
A:
Like the other answers have said -- you have to call beyond compare from a script and pass that to subversion's --diff-cmd option. I use the following script on linux:
#!/bin/bash
test `/usr/bin/bcompare "$6" "$7" -title="$3" -title2="$5" -readonly` > 2 && exit 1; exit 0
That's similar to what the link in CooCooC's post says, except that it translates the return value of beyond compare into what subversion expects: 0 for no difference, 1 for difference. That gets rid of the error messages and aborts that otherwise get in your way...
Nathan Monteleone
2010-08-16 16:12:42