Am Dienstag, 15. November 2011, 11:26:49 schrieb Michal Mazurek: > 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
Yes; I did a check and due to the changes in trunk these patches do not apply anymore. I will try to create a patch set which can be used on top of the longturn branch. I will use the lt.diff from 29. October as a starting point. _______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
