4

So, I've successfully figured out how to do a simple diff and a 3 way merge with command-line subversion and Beyond Compare 3 using Windows 7. Thank you, stackoverflow.

However, I frequently have lots of files that I change in between commits, i.e. an html file, css file and javascript file all related to the same bug fix. When I'm using the built in svn diff, I can just type "svn di" and it will show me a list of all the diffs in all the files. Is there a way to trigger this type of functionality with Beyond Compare 3?

At the moment, when I type "svn di", it will send the first file to Beyond Compare, and when I'm done reviewing the changes, I close the beyond compare window, and the diff ends. There's no way for me to diff the other files without typing in each name manually. (And sometimes I can't remember all the ones I've changed... basically, it gets really messy.)

Is this even possible? If so, how?

Thanks.

Samuel Rossille
  • 18,940
  • 18
  • 62
  • 90
gailbear
  • 519
  • 3
  • 13

2 Answers2

2

Perhaps not what you're looking, but TortoiseSVN integrated with Beyond Compare 3 works a treat for this sort of operation. My workflow after an svn update is typically:

  1. TortoiseSVN > Check For Modifications | Commit
  2. Review each modification by double-click/compare with base (integrated with BC3)
  3. Update svn log based on diff output shown in BC3.

The reason why this may suit your task is that you can select all modified files (Ctrl+A), then double-click/compare with base, and BC3 will load up all the diffs at once in separate tabs.

You might also be able to achieve this from the command line (untested).

si618
  • 16,580
  • 12
  • 67
  • 84
  • this works beautifully, as far as I can tell without using it for a week. You are my favorite person ever :D I can't award the bounty for another 7 hours, though. – gailbear Mar 09 '11 at 14:33
  • Yep that's exactly how I worked too, with TortoiseSVN and BC3. It was fantastic! Now I'm somewhere else and using VSS :/ – demoncodemonkey Mar 12 '11 at 23:57
0

My exposioure to Beyond Compare has only been through collueages' use (so I do not know it very well), but you might want to try the KDiff3 comparision tool instead (free, GPL) which is really excellent. I am not aware of any svn integration problems other than the wrapper issue mentioned here.

Community
  • 1
  • 1
hlovdal
  • 26,565
  • 10
  • 94
  • 165
  • Thanks for the suggestion, but at this point I'm looking for a solution involving Beyond Compare specifically. – gailbear Mar 04 '11 at 19:28