Git error

[Auntie Mangos]

--- a/configure.ac
+++ b/configure.ac
@@ -276,7 +276,11 @@ AC_CONFIG_FILES([
   src/mangosd/Makefile
   src/mangosd/mangosd.conf.dist
   src/bindings/Makefile
-   src/bindings/universal/Makefile
+   src/bindings/ScriptDev2/Makefile
+   src/bindings/ScriptDev2/scriptdev2.conf.dist
+   src/bindings/ScriptDev2/config.h
+   src/bindings/ScriptDev2/sql/Makefile
+   src/bindings/ScriptDev2/sql/Updates/Makefile
])
.
## Configure ACE, if needed
diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am
index 2cc0efd..f2dbbc7 100644
--- a/src/bindings/Makefile.am
+++ b/src/bindings/Makefile.am
@@ -14,4 +14,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
.
-SUBDIRS = universal
+SUBDIRS = ScriptDev2
diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am
index 3fd4068..076d8d8 100644
--- a/src/mangosd/Makefile.am
+++ b/src/mangosd/Makefile.am
@@ -34,7 +34,7 @@ mangos_worldd_SOURCES = \\
.
## Link world daemon against the shared library
mangos_worldd_LDADD = \\
-<----->../bindings/universal/libmangosscript.la \\
+<----->../bindings/ScriptDev2/libmangosscript.la \\
<----->../game/libmangosgame.a \\
<----->../shared/Database/libmangosdatabase.a \\
<----->../shared/Config/libmangosconfig.a \\
@@ -45,7 +45,7 @@ mangos_worldd_LDADD = \\
<----->../../dep/src/sockets/libmangossockets.a \\
<----->../../dep/src/g3dlite/libg3dlite.a
.
-mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/g3dlite -L../bindings/universal/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic
+mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/g3dlite -L../bindings/ScriptDev2/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic
.
## Additional files to include when running 'make dist'
#  Include world daemon configuration
--.
1.6.4.msysgit.0

I remove gitignore part and now patch apply ok.

Thanks to sd2 dev DasBlub

[rusfighter]

Hi i have a small problem when i want to update master mangos with git i just use command git pull but after some days i get this error :

configure.ac: needs update

src/bindings/.gitignore: needs update

src/bindings/Makefile.am: needs update

src/mangosd/Makefile.am: needs update

error: Entry 'configure.ac' not uptodate. Cannot merge.

So everytime i need to create new map and clone mangos , it takes alot of time and i just wonder why i get error.

I use debian btw.

Thx

[freghar]

git reset --hard

before the pull

[xeross155]

git reset --hard HEAD

Or if you have changes you made yourself (This looks like the ScriptDev2 patch) you can also use

Code bash:

git stash

And after updating

Code bash:

git stash apply

[rusfighter]

Yes i have scriptdev2 patch on , should i first create a checkout? Will this avoid the error?

[xeross155]

You can either commit the scriptdev2 patch changes or you can use git stash (apply)

[Unkle Nuke]

Can't he also use ignore to tell git to skip over the patch when pulling updates?

[freghar]

Can't he also use ignore to tell git to skip over the patch when pulling updates?

Indeed he can. He can't, however, use classic .gitignore file (because it's tracked, so he would need to commit it anyway).

The solution is to use .git/ignore file in the repo dir itself. At least AFAIK.

[Lynx3d]

Hm...are you sure?

From gitignore manual:

A gitignore file specifies intentionally untracked files that git should ignore. Note that all the gitignore files really concern only files that are not already tracked by git; in order to ignore uncommitted changes in already tracked files, please refer to the git update-index --assume-unchanged documentation.

Since configure.ac definitely is tracked by git, ignoring it has no effect according to that. And if i understand referenced documentation correctly, using --assume-unchanged will cause the file not to be touched at all, e.g. changes to configure.ac in upstream will not reflect in you working copy, and you need to deal with it manually when it changes.

So for the SD2 patch you basically have the choices:

1) Commit the patch and merge (pull) or rebase to origin/master

2) Reset when git pull tries to update a modified file and gives above error, and reapply patch afterwards

3) Stash when git pull tries to update a modified file and reapply stash afterwards

For any of your own (or non-mangos) code, for gods sake don't work against git and commit it to your branch. If i'm not mistaken, that's what distributed version control was invented for in the first place, because people were sick of having dozens of loose patch files...

[freghar]

Since configure.ac definitely is tracked by git, ignoring it has no effect according to that.

You're right, I forgot about that.

that's what distributed version control was invented for in the first place, because people were sick of having dozens of loose patch files

Believe it or not, most of those people actually prefer to "have dozens of patch files", just because it's easier for their brains.

[darkstalker]

in the end its easier to hangle merge conflicts than tons rejected patches

[alein]

I have another problem.

git clone git://github.com/mangos/mangos.git

Initialized empty Git repository in /home/mangos/mangos/.git/

remote: Counting objects: 52251, done.

remote: Compressing objects: 100% (10113/10113), done.

remote: Total 52251 (delta 43362), reused 50788 (delta 42074)

Receiving objects: 100% (52251/52251), 34.38 MiB | 3161 KiB/s, done.

Resolving deltas: 100% (43362/43362), done.

:~$ cd mangos

:~/mangos$ mkdir src/bindings/ScriptDev2

:~/mangos$ svn co https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2/ src/bindings/ScriptDev2

Checked out revision 1596.

The problem:

:~/mangos$ git apply src/bindings/ScriptDev2/patches/MaNGOS-8759-ScriptDev2.patch

error: patch failed: src/bindings/.gitignore:11

error: src/bindings/.gitignore: patch does not apply

Linux Ubuntu server 2.6.28-18

git version 1.6.0.4

[DasBlub]

@alein: http://www.scriptdev2.com/error-patch-failed-t5166.html

[cpress]

ok, what do we do with this?