Author Topic: How do you create a diff?  (Read 2056 times)

0 Members and 1 Guest are viewing this topic.

Offline blowfish

  • 211
  • Join the cult of KILL MY ROUTER!!!!!!!!!!1
How do you create a diff?
I have been experimenting with the source code, and I was wondering how you create a diff, since those seem to be the standard method of exchanging code changes.  Does anyone know how? :confused:

 

Offline phreak

  • Gun Phreak
  • 211
  • -1
Re: How do you create a diff?
Assuming you have TortoiseSVN:

Right click on File in question
Go to the TortoiseSVN option
Select "Create Patch" (near the bottom)
Save the diff file to wherever and upload it.  We will then take a look at what you've changed and possibly incorporate the code into the build.  If it is a good new feature or a bug fix, we would like to have some submissions like that before giving you direct write access.
Offically approved by Ebola Virus Man :wtf:
phreakscp - gtalk
phreak317#7583 - discord

 

Offline blowfish

  • 211
  • Join the cult of KILL MY ROUTER!!!!!!!!!!1
Re: How do you create a diff?
I actually don't have TortiseSVN :( (I am on a mac)

 

Offline phreak

  • Gun Phreak
  • 211
  • -1
Re: How do you create a diff?
Well that's your own fault then  :blah:

I guess since the Mac OS unix-like, you can open up a console and do this

svn diff filename_in_question.cpp > output.diff
Offically approved by Ebola Virus Man :wtf:
phreakscp - gtalk
phreak317#7583 - discord

 

Offline blowfish

  • 211
  • Join the cult of KILL MY ROUTER!!!!!!!!!!1
Re: How do you create a diff?
Thanks, that worked.  But is there a way to get it to ignore white space?

 

Offline Nuke

  • Ka-Boom!
  • 212
  • Mutants Worship Me
Re: How do you create a diff?
oh goodie, i was about to ask the same thing. didn't know tortoise had a patcher.
I can no longer sit back and allow communist infiltration, communist indoctrination, communist subversion, and the international communist conspiracy to sap and impurify all of our precious bodily fluids.

Nuke's Scripting SVN

 

Offline Wanderer

  • Wiki Warrior
  • 211
  • Mostly harmless
Re: How do you create a diff?
You could probably also use one of the other GUIs for SVN revisions.. http://en.wikipedia.org/wiki/Comparison_of_Subversion_clients There seems to be quite a few of those for Macs. With tortoise the patching was really simple.. Just using 'create patch' to 'save' your changes as a diff, reverting the changes and then applying a patch.
Do not meddle in the affairs of coders for they are soggy and hard to light

 

Offline phreak

  • Gun Phreak
  • 211
  • -1
Re: How do you create a diff?
Thanks, that worked.  But is there a way to get it to ignore white space?


svn diff -x -w filename_in_question.cpp > output.diff
Offically approved by Ebola Virus Man :wtf:
phreakscp - gtalk
phreak317#7583 - discord

 

Offline blowfish

  • 211
  • Join the cult of KILL MY ROUTER!!!!!!!!!!1
Re: How do you create a diff?
Thank you, that worked.