Question about SVN

[celebor]

Greetings,

Here's an explanation to my question/what I want to achieve.

Say there is rAthena SVN and then there is my private SVN. What I want to achieve is having the "trunk" folder from rA's SVN to be under my SVN(already have that much done) + but I also want to be able to apply latest revisions from rA's SVN to my SVN.

What would be the best way to go about this? Branching? Diffing?

Thank you for reading.

Edited January 22, 2013 by celebor

[celebor]

Hmm. Was my question not clear enough, or does no one actually know the answer?...

[Brian]

This is how I used to do it: http://www.eathena.w...ost&pid=1165563

Brainstorm also describes another method in that topic.

2 folders: one for our SVN (which only has eAthena files we edited), and one for eAthena trunk

Then I export our SVN into the eAthena folder.

Then do a svn update on the eAthena folder.

Then for every file that is says Merged, copy that changed file back to your SVN folder.

Then commit those to your svn with a message like "* Merged eAthena trunk 13575"

then next time, just do SVN update on the eAthena folder.

If there are any "Merged" files, copy those to your SVN and commit.

If not, then there's nothing to update.

and to help me remember, I rename our SVN folder (on my comp, not in the svn) to the eAthena revision of the eAthena folder.

and to re-create this on server, we use:

svn co http://svn.eathena.ws/svn/ea/trunk/
svn export --force http://svn.assembla.com/svn/PathToYourSVN/trunk/ trunk/
// then upload your map_cache.dat if necessary
// then upload secret ../conf/import/ login,char,map,inter files 
cd trunk
./configure
make clean
make sql

[celebor]

This is how I used to do it: http://www.eathena.w...#38;pid=1165563

Brainstorm also describes another method in that topic.

2 folders: one for our SVN (which only has eAthena files we edited), and one for eAthena trunk

Then I export our SVN into the eAthena folder.

Then do a svn update on the eAthena folder.

Then for every file that is says Merged, copy that changed file back to your SVN folder.

Then commit those to your svn with a message like "* Merged eAthena trunk 13575"

then next time, just do SVN update on the eAthena folder.

If there are any "Merged" files, copy those to your SVN and commit.

If not, then there's nothing to update.

and to help me remember, I rename our SVN folder (on my comp, not in the svn) to the eAthena revision of the eAthena folder.

and to re-create this on server, we use:

svn co http://svn.eathena.ws/svn/ea/trunk/
svn export --force http://svn.assembla.com/svn/PathToYourSVN/trunk/ trunk/
// then upload your map_cache.dat if necessary
// then upload secret ../conf/import/ login,char,map,inter files 
cd trunk
./configure
make clean
make sql

This is delicious and spot on! Thank you Brian.