On Mon, Nov 14, 2011 at 09:40:51PM +0100, Matthias Pfafferodt wrote:
> missed an important thing:
> 
> The needed patches are only in S2_4 and trunk; you have to pick svn20274-
> sv20277 and svn20286-svn20296. These patches do not change the network 
> interface. Thus, they should be easily be backported to S2_3.

I have trouble applying those revisions.

This is what i do:
[11:17:ttyp9][dude@hopek:~:3]$ cat /tmp/diff
git svn log -p -r 20274 > /tmp/lua/20274
git svn log -p -r 20275 > /tmp/lua/20275
git svn log -p -r 20276 > /tmp/lua/20276
git svn log -p -r 20277 > /tmp/lua/20277
git svn log -p -r 20286 > /tmp/lua/20286
git svn log -p -r 20287 > /tmp/lua/20287
git svn log -p -r 20288 > /tmp/lua/20288
git svn log -p -r 20289 > /tmp/lua/20289
git svn log -p -r 20290 > /tmp/lua/20290
git svn log -p -r 20291 > /tmp/lua/20291
git svn log -p -r 20292 > /tmp/lua/20292
git svn log -p -r 20293 > /tmp/lua/20293
git svn log -p -r 20294 > /tmp/lua/20294
git svn log -p -r 20295 > /tmp/lua/20295
git svn log -p -r 20296 > /tmp/lua/20296

Run this script after 'git checkout master'
Run 'git checkout S2_3-lua' which is a branch i created from the
remotes/S2_3 branch.
Try to apply the first revision:
[11:18:ttyp6][dude@hopek:~/src/freeciv:65]$ patch -p1 < /tmp/lua/20274

Get many errors:
[lots of output]
Hunk #1 failed at 0.
1 out of 1 hunks failed--saving rejects to server/scripting/api_actions.c.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/server/scripting/api_actions.h b/server/scripting/api_actions.h
|deleted file mode 100644
|index 871038a..0000000
|--- a/server/scripting/api_actions.h
|+++ /dev/null
--------------------------
Patching file server/scripting/api_actions.h using Plan A...
Empty context always matches.
Hunk #1 failed at 0.
1 out of 1 hunks failed--saving rejects to server/scripting/api_actions.h.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/server/scripting/api_auth.c b/server/scripting/api_auth.c
|deleted file mode 100644
|index df568f5..0000000
|--- a/server/scripting/api_auth.c
|+++ /dev/null
--------------------------
File to patch: 

I kill it after this, since it waits for some input.

Some chunks succeed, some fail. I use OpenBSD's patch, not GNU patch, if
that matters.

This is `git stat` after trying to apply the first diff:
[11:22:ttyp6][dude@hopek:~/src/freeciv:67]$ git stat
# On branch S2_3-lua
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   common/Makefile.am
#       modified:   configure.ac
#       modified:   manual/Makefile.am
#       modified:   server/auth.c
#       modified:   server/citytools.c
#       modified:   server/cityturn.c
#       modified:   server/diplhand.c
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       common/scriptcore/
no changes added to commit (use "git add" and/or "git commit -a")

What is curious, is that previous commits are empty:
[11:24:ttyp6][dude@hopek:~/src/freeciv:76]$ git svn log -p -r 20273 
------------------------------------------------------------------------
[11:25:ttyp6][dude@hopek:~/src/freeciv:77]$ git svn log -p -r 20272 
------------------------------------------------------------------------
r20271 fixes some bug in the client so it is not relevant.


-- 
Michal Mazurek

_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to