Go Back   Scooter Forums > Beyond Compare 3 Discussion > Linux
Register FAQ Search Today's Posts Mark Forums Read

Reply
 
Thread Tools Display Modes
  #1  
Old 03-Nov-2008, 06:12 AM
antik antik is offline
New User
 
Join Date: Nov 2008
Posts: 1
Default BC3 as an external diff app for Subversion

I'm excited to see that BC is now available for Linux! Many thanks to John (aka Ender) for the Gentoo eBuild!

I wanted to use BC3 as an external diff tool for SVN. I tried BC's Subversion integration instructions but they're clearly aimed at Windows and porting the recommended script didn't work as well as I'd like for what I use BC for.

I spent a few minutes fiddling and found a hack to do what I want BC to do in Linux: when I type 'svn diff' BC spawns with each comparison in its own tab.

To do this, I wrote the following script and put it in /usr/bin/bcompare_svn:
Code:
#!/bin/bash

/usr/bin/bcompare $6 $7 &

exit 0
The invocation of bcompare is obvious but I had to add "exit 0" so that svn would open more than one file at a time.

To make svn invoke my script, I added the following line in the [helpers] section in ~/.subversion/config
Code:
diff-cmd=/usr/bin/bcompare_svn
Just thought I post it up in case anyone else might find it useful!
Reply With Quote
  #2  
Old 03-Nov-2008, 10:50 AM
Craig Craig is offline
Team Scooter
 
Join Date: Oct 2007
Location: Madison, WI
Posts: 2,097
Default

Hi antik,

Thanks for the information. Are you sure about running BC in the background though? At least one Windows that doesn't work because various version control systems create temp files and delete them when the process ends, so if BC isn't blocking it can delete the files before the original window has a chance to load the comparison.
__________________
Craig P Scooter Software
Reply With Quote
  #3  
Old 14-Oct-2009, 09:59 AM
aceinnovations aceinnovations is offline
Visitor
 
Join Date: Jul 2009
Posts: 5
Default

Not sure about the blocking, but might as well complete the script with titles:

Code:
#!/bin/bash

bcompare "$6" "$7" -title1="$3" -title2="$5"

exit 0
Reply With Quote
  #4  
Old 16-Sep-2010, 10:44 AM
AxMstrLp AxMstrLp is offline
New User
 
Join Date: Sep 2010
Posts: 1
Question Whole change-set in the bcompare browser?

Rather than popping up <n> different windows for every file changed, has anyone come up with a way to view a whole change-set in the bcompare file browser?
Reply With Quote
  #5  
Old 17-Sep-2010, 01:16 PM
Aaron Aaron is offline
Team Scooter
 
Join Date: Oct 2007
Location: Madison, WI
Posts: 5,434
Default

Hello,

I am not familiar with an automated way to do this, but you could checkout a specific version of the repository to a Temp Diff folder, and then run a Folder Comparison comparing that folder to your folder. Running a Rules-based comparison would show any changed files, and they could be double-clicked to see more detail.
__________________
Aaron P Scooter Software
Reply With Quote
Reply

Tags
subversion

Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off
Forum Jump


All times are GMT -6. The time now is 10:48 PM.


Powered by vBulletin® Version 3.7.1
Copyright ©2000 - 2013, Jelsoft Enterprises Ltd.