From 598743aca97d11e128a4af822cc2ca4a39542886 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 24 Apr 2013 11:34:14 -0700 Subject: Remove the old stuff about the directory moves --- README.mv.txt | 31 ------------------------------- git/hooks/post-merge | 2 +- move-stuff.sh | 33 --------------------------------- 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 README.mv.txt delete mode 100755 move-stuff.sh diff --git a/README.mv.txt b/README.mv.txt deleted file mode 100644 index 1d2ce605..00000000 --- a/README.mv.txt +++ /dev/null @@ -1,31 +0,0 @@ -Changing stuff into subdirectories has several problems: -1. There are files that are copied -2. You may need to change -3. git submodules don't automatically work the way you think they should - you have to add a git hook manually. Unfortunately, there is no hook at all for git reset --hard (use git checkout -B instead) - -problem 2 will be solved (or at least ameliorated) by creating scripts in the root (which may conflict with existing names, but hey! I need your attention) -problems 1 and 3 should be solved by running a script -Stuff to do manually: -* put login-server, char-server, map-server binaries in /usr/local/bin (or some other location callable from the scripts) -Stuff to do later: -* change the client-data submodule to track the main project and delete the testing repository for client data - -Stuff to do much later: -* move login/ to the server repository -* Store stuff in a well-known directory -* create a 'make install' target -* create /etc/init.d scripts and get packaged - --o11c - - -Useful commands: -git submodule update lose changes in submodule and reset to upstream -git submodule update --merge merge changes in submodule from upstream -git submodule update --rebase rebase local changes on top of upstream - (use this, for the same reason you should use git pull --rebase instead of just git pull - but remember that it's dangerous) -git submodule sync change the url of the submodule (when testing is deleted) -git config --global url.git@gitorious.org:.pushInsteadOf git://gitorious.org - for people with push access: don't pull via ssh (which is slower anyway), required for submodules to work properly -git checkout HEAD^ -B master completely roll back the latest commit -git reset HEAD^ undo the last commit but keep changes diff --git a/git/hooks/post-merge b/git/hooks/post-merge index c5354cfd..1105fd9f 100755 --- a/git/hooks/post-merge +++ b/git/hooks/post-merge @@ -13,4 +13,4 @@ git submodule update --merge # WARNING: to people with push access. # it is essential that changes to the client data be pushed before changes to server data # Also, you may find this useful: (you should always clone using the git:// url) -# git config --global url.git@gitorious.org:.pushInsteadOf git://gitorious.org +# git config --global url.git@github.com:.pushInsteadOf git://github.com diff --git a/move-stuff.sh b/move-stuff.sh deleted file mode 100755 index f7e72e32..00000000 --- a/move-stuff.sh +++ /dev/null @@ -1,33 +0,0 @@ -mv online.html online.txt world/ - -mv save/account.txt login/save/ - -mv save/accreg.txt world/save/ -mv save/athena.txt world/save/ -mv save/storage.txt world/save/ -mv save/party.txt world/save/ -mv save/castle.txt world/save/ -mv save/guild.txt world/save/ -mv save/g_storage.txt world/save/ - -mv save/mapreg.txt world/map/save/ - -rmdir save - - -rm conf/eathena-monitor.conf - -mv conf/login_local.conf login/conf/ -mv conf/ladmin_local.conf login/conf/ -mv conf/gm_account.txt login/save/ - -mv conf/char_local.conf world/conf/ - -mv conf/atcommand_local.conf world/map/conf/ -mv conf/battle_local.conf world/map/conf/ -mv conf/map_local.conf world/map/conf/ -mv conf/help.txt world/map/conf/ -mv conf/motd.txt world/map/conf/ -mv conf/magic.conf world/map/conf/ -mv conf/spells-build world/map/conf/ -rmdir conf -- cgit v1.2.3-70-g09d2