Author: gateway
Date: Tue Mar 17 03:02:26 2009
New Revision: 6860
URL: http://svn.gna.org/viewcvs/warzone?rev=6860&view=rev
Log:
Add a check if deliveryPointToMove == NULL in the blueprint code and ASSERT.
From: Gerard Krol
Modified:
trunk/src/display3d.c
_
Author: gateway
Date: Tue Mar 17 11:22:02 2009
New Revision: 6862
URL: http://svn.gna.org/viewcvs/warzone?rev=6862&view=rev
Log:
Merge branch 'master' of g...@gitorious.org:warzone2100/gerard_
From: Git SVN Gateway
Added:
trunk/tools/gitsvngateway/
trunk/tools
Author: gateway
Date: Tue Mar 17 15:18:18 2009
New Revision: 6863
URL: http://svn.gna.org/viewcvs/warzone?rev=6863&view=rev
Log:
The gitsvngateway script now allows you to check what it is about to commit. It
also tries to unravel a merge and commit the individual changes to SVN.
From: Gerard Kr
Author: gateway
Date: Tue Mar 17 15:18:31 2009
New Revision: 6864
URL: http://svn.gna.org/viewcvs/warzone?rev=6864&view=rev
Log:
Use colour to print the messages from gitsvngateway to better separate them
from the output from the Git commands.
From: Gerard Krol
Modified:
trunk/tools/gitsvn
Author: gateway
Date: Tue Mar 17 16:27:17 2009
New Revision: 6865
URL: http://svn.gna.org/viewcvs/warzone?rev=6865&view=rev
Log:
The gitsvngateway now uses git cherry-pick instead of git merge --squash to
prevent merge conflicts.
From: Gerard Krol
Modified:
trunk/tools/gitsvngateway/gitsvn
Author: gateway
Date: Tue Mar 17 16:53:17 2009
New Revision: 6866
URL: http://svn.gna.org/viewcvs/warzone?rev=6866&view=rev
Log:
Small cleanup of gitsvngateway, the code should be more robust now.
From: Gerard Krol
Modified:
trunk/tools/gitsvngateway/gitsvngateway
Author: gateway
Date: Wed Mar 18 18:42:49 2009
New Revision: 6868
URL: http://svn.gna.org/viewcvs/warzone?rev=6868&view=rev
Log:
Small changes to make gitsvngateway work with Git 1.6.0.6.
From: Gerard Krol
Modified:
trunk/tools/gitsvngateway/gitsvngateway
_
Author: gateway
Date: Wed Mar 18 18:42:53 2009
New Revision: 6869
URL: http://svn.gna.org/viewcvs/warzone?rev=6869&view=rev
Log:
Add some checks to gitsvngateway to speed up execution when there are no
changes.
From: Gerard Krol
Modified:
trunk/tools/gitsvngateway/gitsvngateway
_
Author: gateway
Date: Wed Mar 18 18:42:45 2009
New Revision: 6867
URL: http://svn.gna.org/viewcvs/warzone?rev=6867&view=rev
Log:
Use a slightly more robust way of detecting merges. It still is ugly though.
From: Gerard Krol
Modified:
trunk/tools/gitsvngateway/gitsvngateway
___
Author: gateway
Date: Wed Mar 18 18:42:56 2009
New Revision: 6870
URL: http://svn.gna.org/viewcvs/warzone?rev=6870&view=rev
Log:
gitsvngateway no longer uses a file to store its state but instead determines
it by checking if certain branches exist.
From: Gerard Krol
Modified:
trunk/tools/g
Author: gateway
Date: Wed Mar 18 18:43:00 2009
New Revision: 6871
URL: http://svn.gna.org/viewcvs/warzone?rev=6871&view=rev
Log:
Use the _gitsvngateway prefix for internally used branches.
From: Gerard Krol
Modified:
trunk/tools/gitsvngateway/gitsvngateway
Author: gateway
Date: Wed Mar 18 18:43:04 2009
New Revision: 6872
URL: http://svn.gna.org/viewcvs/warzone?rev=6872&view=rev
Log:
Use getopt to parse options for gitsvngateway and add the --dry-run, --prefix
and --remote options.
From: Gerard Krol
Modified:
trunk/tools/gitsvngateway/gitsvng
Author: gateway
Date: Wed Mar 18 18:43:07 2009
New Revision: 6873
URL: http://svn.gna.org/viewcvs/warzone?rev=6873&view=rev
Log:
Add an --automatic switch to gitsvngateway, where it will not ask to merge
changes but instead abort.
From: Gerard Krol
Modified:
trunk/tools/gitsvngateway/gitsv
Author: gateway
Date: Wed Mar 18 18:43:11 2009
New Revision: 6874
URL: http://svn.gna.org/viewcvs/warzone?rev=6874&view=rev
Log:
Add a --no-fetch option to gitsvngateway to increase the speed of running it
over a lot of branches.
From: Gerard Krol
Modified:
trunk/tools/gitsvngateway/gitsvn
Author: gateway
Date: Wed Mar 18 18:43:15 2009
New Revision: 6875
URL: http://svn.gna.org/viewcvs/warzone?rev=6875&view=rev
Log:
Replace slashes by underscores for the gitsvngateway merge filename, and don't
make it return a non-zero exit code when the --dry-run was successful.
From: Gerard Krol
Author: gateway
Date: Fri Mar 20 20:42:22 2009
New Revision: 6882
URL: http://svn.gna.org/viewcvs/warzone?rev=6882&view=rev
Log:
Swap the order of the arguments when calling same_commit to check if we need to
push, because only old..new seems to work correctly.
From: Gerard Krol
Modified:
Author: gateway
Date: Fri Mar 20 20:42:28 2009
New Revision: 6883
URL: http://svn.gna.org/viewcvs/warzone?rev=6883&view=rev
Log:
No longer assert when the thing we want to display a blueprint of is not a
building, it might be a droid or a feature from the debug menu.
From: Gerard Krol
Modified
Author: gateway
Date: Sat Mar 21 01:19:14 2009
New Revision: 6885
URL: http://svn.gna.org/viewcvs/warzone?rev=6885&view=rev
Log:
Updates .gitignore with lots of files to ignore from windows builds
From: Buginator
Modified:
trunk/.gitignore
___
W
Author: gateway
Date: Mon Mar 30 16:14:38 2009
New Revision: 6929
URL: http://svn.gna.org/viewcvs/warzone?rev=6929&view=rev
Log:
Fix ticket #293: Crashes in netlog code.
From: Per Inge Mathisen
Modified:
trunk/lib/netplay/netlog.c
___
Warzone-co
Author: gateway
Date: Mon Mar 30 18:48:25 2009
New Revision: 6931
URL: http://svn.gna.org/viewcvs/warzone?rev=6931&view=rev
Log:
2.2: Backport fix for netlog crashes described in ticket:293.
From: Per Inge Mathisen
Modified:
branches/2.2/lib/netplay/netlog.c
__
20 matches
Mail list logo
