Code Management

pfyon · #1 07-12-2009, 11:06 PM

I ended up doing a svn import of the code I had checked out (probably could have used the google code svn instead). Deleted the old server code and re-checked it out from my local svn, now I'm having issues performing a merge with the eqemu svn. Probably a syntax thing though.

pfyon · #2 07-13-2009, 09:58 PM

Alright, this is frustrating me. Maybe one of you who have the svn stuff working can help.

How'd you go about setting it up? Cavedude, did you mean you exported the eqemu svn, then made a copy of it and merged those two? I guess I don't know enough about subversion to understand really what i'm doing.

I've tried checking out the eqemu code and importing it into a fresh svn. This lets me make changes to it from my home computer, but can't figure out how to add in changes from the google code svn later on.

I also tried exporting the eqemu code and merging it with the other code I checked out from before, but that doesn't seem to work (not a working copy error).

Is it as simple as checking out two copies and using svn switch to switch the repository of one to a local one, and using the other to receive updates from the google code svn? Then merging the two when you need to.

pfyon · #3 07-13-2009, 10:10 PM

Great, there goes the edit button again.

A bit more about svn switch. I tried checking out the google code svn then using svn switch to change repository locations, but it gives me the error '<local repository> is not the same repository as <eqemu repository>. Apparently I can't use --force with svn switch either, which I found referenced online when looking for fixes.

**gaeorn** · #4 07-14-2009, 07:44 AM

I created my own repo using svn import on a copy of the emu code. Once that was done, I removed that copy of the emu code.

To start working with that code, I checked it out and was then able to make changes, merges, etc. to it and commit those changes to my svn repo at will.

To merge, execute the following in the top of the code checked out from your personal repo:

Code:

svn merge -r<startrev>:<endrev> <url>

startrev and endrev define the range of changes to be merged.
url is the url of the repository you are pulling the changes from to merge to your own copy.

After merging the changes, you then have to commit to your repo.

For example, to merge the changes from rev 750 to rev 755 of the emu code into your repo:

Code:

svn merge -r750:755 http://projecteqemu.googlecode.com/svn/trunk/EQEmuServer
svn commit

There are two caveats of svn merge you should be aware of.

1) If the changes from the merge create a new file, it will give you an error and not perform the merge. To fix this, find the added files and add them to your svn repo before performing the merge. As in:

Code:

touch utils/sql/svn/773_monk_rules.sql
svn add utils/sql/svn/773_monk_rules.sql
svn merge -r772:773 http://projecteqemu.googlecode.com/svn/trunk/EQEmuServer

2) If the changes from the merge conflict with one of your local code changes, you will get a C code from the merge for the affected file. You will have to edit that file to manually merge the changes for the affected areas. The affected areas will be wrapped in tags of the form <<<<<<< and >>>>>> with a ======= separator between the new and the old code. You have to edit that area to clean it up and remove the extra code and the tags and separator. Once you have done that, you need to let svn know you have done so using:

Code:

svn resolve <filename>

After you have done that for all files with conflicts, you can commit your changes to your repo.

pfyon · #5 07-17-2009, 03:11 PM

Thanks for the help guys. I think I ended up doing what gaeorn suggested. The problem was trying to do it all server side.

I checked out the official code, copied it over to my working copy, committed that, then made a branch. Now I do my work on one branch and copy over the official code as necessary to another, then merge them.