On 21.04.2013 13:21, Michael T. Pope wrote:
On Sun, 21 Apr 2013 09:54:45 AM Michael Vehrs wrote:
After some minor difficulties with git, I have reverted my development
branch to
b56c15c.
I usually do:
git checkout -b<working-branch-name>
git reset --hard<commit-hash>
to get to a particular commit.
Hopefully, I can figure out what I did wrong. However, I have no
clear idea how to apply changes from that branch to master.
"git rebase master"? I admit though sometimes being sufficiently confused that
I just fall back to making a patch out of the current changes, and apply them
to a new branch based off master.
I can see one possibility why doing the fixups in Game might not always work---
we often just update units and or the colony, so some call to
updateProductionType in WorkLocation may be necessary in general. However in
the simple case of just bringing up the test game and looking at the colony
that should not be the case, and a full read of Game is happening in both
server and client.
Cheers,
Mike Pope
As it turns out, all test failures can be fixed with the attached
one-liner. What next?
Regards
Michael
diff --git a/src/net/sf/freecol/common/model/ColonyTile.java
b/src/net/sf/freecol/common/model/ColonyTile.java
index 585c85b..ae664da 100644
--- a/src/net/sf/freecol/common/model/ColonyTile.java
+++ b/src/net/sf/freecol/common/model/ColonyTile.java
@@ -80,6 +80,7 @@ public class ColonyTile extends WorkLocation implements
Ownable {
setColony(colony);
this.workTile = workTile;
+ updateProductionType();
}
/**
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers
