|
Pages: [1]
|
 |
|
Author
|
Topic: Creating a diff or patch from a modded project. (Read 1809 times)
|
Defender
Enlightened
 Offline
Gender: 
Posts: 817
|
I need some help creating and applying a patch for shivers balance mod. I want to apply his changes to the current svn of 0.8. I tried some methods I searched for myself but they gave me errors and then I couldn't compile the source.
Places I tried but little success.
http://jungels.net/articles/diff-patch-ten-minutes.html
http://docs.moodle.org/dev/How_to_create_a_patch
I'm working with same source directories in both shivers mod and 0.8. I tried creating a .patch file from the differences in shivers mod compared to 0.7 uqm, and applying it gave some success some errors too. Compiling it was a no go.
I feel I'm on the right path but need some more guidance.
|
|
|
|
« Last Edit: May 04, 2012, 12:26:40 am by Defender »
|
Logged
|
|
|
|
|
|
Defender
Enlightened
Offline
Gender:
Posts: 817
|
Thank you meep for your time, but it's just not working the way I thought it would. There is over 300 changes between release 0.7 and 0.7 balance mod. My skills are just not up to par for something like this. I'll just play with the time mod I added to his project and go with it. Hopefully he will still support his mod in the future when uqm updates. But somehow I doubt it.
|
|
|
|
|
Logged
|
|
|
|
Gekko
*Many bubbles*
Offline
Gender:
Posts: 199
Arena regular
|
If he doesn't I will. After the 0.7.0 changes the mod isn't too hard to keep up-to-date. Applying the patch isn't that hard: Take a diff between the release 0.7.0 and balance mod, then use something like meld to do the merging. I'm sure most of the stuff is pretty much as it was back when the 0.7.0 port was finished.
|
|
|
|
|
Logged
|
|
|
|
Defender
Enlightened
Offline
Gender:
Posts: 817
|
Thanks Gekko, I will try my hand at it again, see what I can do.
If it doesn't work, I'm handing you the torch to you 
|
|
|
|
|
Logged
|
|
|
|
Defender
Enlightened
Offline
Gender:
Posts: 817
|
Gekko, if your still around and want to do it, I would not mind. I tried my hand at it but just can't seem to get it to work. I do not know of this "meld" you speak of as I'm doing this all from windows.
|
|
|
|
« Last Edit: May 15, 2012, 01:53:32 am by Defender »
|
Logged
|
|
|
|
Death 999
Global Moderator
Enlightened
Offline
Gender:
Posts: 3873
We did. You did. Yes we can. No.
|
It's not a command - it's manually figuring out how to do both changes, or if one has to go, which one and whether there are any repercussions and if so how to deal with them.
|
|
|
|
|
Logged
|
|
|
|
Defender
Enlightened
Offline
Gender:
Posts: 817
|
If they're any conflicts from one code to the next, I wouldn't even know it let alone be able to fix them. I'm over my head on this one. Thank you for your response on the matter though.
|
|
|
|
|
Logged
|
|
|
|
Death 999
Global Moderator
Enlightened
Offline
Gender:
Posts: 3873
We did. You did. Yes we can. No.
|
Well, often they'll be something really simple. If you're using the command-line svn tool, then you can request a diff. Just today I had a 'conflict' where I had indented something differently than in the svn repository. Obviously, I just said to go with the repository version.
It isn't always that easy, but it's worth checking.
|
|
|
|
|
Logged
|
|
|
|
|
Pages: [1]
|
|
|
|
|
