L2J Server

Im following this guide I googled. Told me to svn check out and update, which I did. Then save your patch txt file to L2j\java\net\sf\l2j . Go back to your gameserver fold (which mine is L2j) right click go to TortoiseSVN then apply patch. TortoiseMerge comes up then I need to find my patch txt file at the path above. But after I do that nothing happens.. Could someone tell me what I did wrong or point me to a better guide maybe.

bump. If anything else is needed to get some help let me know. I could show the patch.txt file im talking about if needed. But I just need help applying the patch to my server files so I can compile.

patches can be applied with a tool, e.g. eclipse or tortoisesvn or any other team tools.

http://l2jserver.com/wiki/How_to_Apply_a_Patch

Yea this is the guide I used and I followed every step.
Step where im stuck.
A window opens, at the bottom, in Select Patch, toggle file and click Browse. Find the .txt file(s) that you placed in the temporary folder.
Click Next
(Nothing happens after that) My TortoiseMerger is still blank after opening my txt file for the patch.

Update:
Tried using Eclipse to apply the patch and nothing happened.

Someone else told me to right click my build.xml apply patch, find the filename.patch path then click next. go to ant and compile the build.xml. When I did that it wouldn't let me add the build to a ant file. Said unable to parse an ant buildfile

I don't know if im doing this right at all but this is what i did. Put my patch.txt in the L2j\java\net\sf\l2j . Went back to the gameserver folder (L2j) right clicked create patch and it tells me to save it at the L2j\Patch.patch. Then I open eclipse right click my build.xml >Team >apply patch>find path to patch.patch>finish. Go to Ant add build.xml get error <unable to parse an ant buildfile>

Sorry for double post its kinda of a bump/update of what ive been doing and told to try.

Right-click the top folder of the project. Then choose Team, then apply patch and follow the guide.

To compile the game, right click on the build.xml, and choose Run as, and then 1 Ant build.

Yea that still gives me a ant buildfile error. I applied the patch to the L2_GameServer folder. then ran the build.xml with ant but wouldn't work.

What error do you get?

Well I got the build.xml to build a ant file. But when I right clicked my L2_GameServer folder and applied patch to my file called Patch.patch and clicked next nothing happened so I thought it worked. I guess im having troubles getting my patch file to patch to my server.

This is what Ive been doing.
Step 1:
Took patch.txt put in L2_GameServer/Java/net/sf/l2j
Step 2:
Right clicked on L2_GameServer folder, Create patch. Saved the Patch file to L2_GameServer\ as the name Patch.patch.
Step 3:
Open eclipse and import my L2_GameServer pack. Right click My L2_GameServer. Apply Patch > Find path to Patch.patch file. Click Next Click on my L2_GameServer pack again, Click Next. Under Patch content says java/net/sf/l2j/Patch.txt doesn't exist. (But it is there). Click Finish it closes with no loading or anything at all so I don't know if thats what it does.
Step 4:
Right click build.xml run as 1 Ant and it compiles. But my patch doesn't work so I don't have my patched files I want.

This is the patch im trying to run. http://pastebin.ca/1466623

First of all, you don't have to have the patch in the gamefolder. You can store it anywhere. The file itself isn't needed for it to compile, all it contains is the changes to be made to files already existing in the gamefolder.

Secondly, i think the problem is that it's the incorrect path, or rather, it has too much path in it!

When you apply the patch - or try to - and you get to where it sais the file doesn't exist, change "Ignore leading path name segments" to 2 or maybe 3, and the error about the file not existing should go away.

If it still doesn't work, the patch is probably bad.

Uh..I don't get it what you told me worked. when I clicked finish this time it did a 2 minute load while it was compiling the files. Then when it was done i compiled the build.xml and looked at my L2J_Server.zip and the files were still not changed...

Well, I actually tried to apply that patch, but it wasn't recognized as a patch for some reason.

Find the files in the patch, and edit them manually.

Adding the patch file by file and it seems to be all good for a few errors if someone could tell me how to fix them. Since it is a custom config I guess it doesn't pick up some commands. Theres 34 errors, 4 of them are Duplicate So ill post 1 of each error as a example because there all the same after that.
Duplicate method iscool() in type L2PcInstance line 5524
The method iscool() is undefined for the type L2PcInstance
The method isnoob() is undefined for the type L2PcInstance
So if anyone knows how I can fix this problem please help me out so i can compile thank you for all your help.

janiii wrote:patches can be applied with a tool, e.g. eclipse or tortoisesvn or any other team tools.

http://l2jserver.com/wiki/How_to_Apply_a_Patch

The guide isn´t there, I am looking it for apply a path using tortoisesvn and is not there.

Thank you.

Well i fnd using google a guide using torstoise and here there is.

Applying a Patch File

Patch files are applied to your working copy. This should be done from the same folder level as was used to create the patch. If you are not sure what this is, just look at the first line of the patch file. For example, if the first file being worked on was doc/source/english/chapter1.xml and the first line in the patch file is Index: english/chapter1.xml then you need to apply the patch to the doc/source/ folder. However, provided you are in the correct working copy, if you pick the wrong folder level, TortoiseSVN will notice and suggest the correct level.

In order to apply a patch file to your working copy, you need to have at least read access to the repository. The reason for this is that the merge program must reference the changes back to the revision against which they were made by the remote developer.

From the context menu for that folder, click on TortoiseSVN → Apply Patch... This will bring up a file open dialog allowing you to select the patch file to apply. By default only .patch or .diff files are shown, but you can opt for “All files”. If you previously saved a patch to the clipboard, you can use Open from clipboard... in the file open dialog.

Alternatively, if the patch file has a .patch or .diff extension, you can right click on it directly and select TortoiseSVN → Apply Patch.... In this case you will be prompted to enter a working copy location.

These two methods just offer different ways of doing the same thing. With the first method you select the WC and browse to the patch file. With the second you select the patch file and browse to the WC.

Once you have selected the patch file and working copy location, TortoiseMerge runs to merge the changes from the patch file with your working copy. A small window lists the files which have been changed. Double click on each one in turn, review the changes and save the merged files.

The remote developer's patch has now been applied to your working copy, so you need to commit to allow everyone else to access the changes from the repository.