merge 2977

Development
1

I seem to have made a bookkeeping error. There was something important that crept into r2977, but I didn’t put it in the log. My fault. That’s why I shouldn’t mix merges with important changes. Could Joel or Rodney merge 2977 into the trunk?

  • M.

P.S.: This is the patch that’s critical:

— MapBoard.java (revision 2972)
+++ MapBoard.java (working copy)
@@ -2471,7 +2471,7 @@
String[] s = new String[3];
int maxSize = set.getMapBoardSymbolSize();
for (int i = 0; i < 3; ++i)

  •                           s[i] = Double.toString((double) set.getMapBoardSymbolSize(i) / (double) maxSize);

  •                           s[i] = Double.toString(set.getZoomFactor(i));
                  zoom.setAttribute("zoomLevels", StringArrayConfigurer.arrayToString(s));
                  zoom.addTo(mainMap);
                  getMainMap().add(zoom);
2

Thus spake “mkiefte”:

Done.

I missed it because I had some trouble with conflicts when I merged 2977
and had trouble telling the real changes from the parts coming from the
merge you did at the same time.

Best to commit merges and new work separately.

–
J.

Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org

Post generated using Mail2Forum (mail2forum.com)

3

Thanks! I think I’ve mostly figured out SVN.

  • M.

On 04/02/2008, Joel Uckelman uckelman@nomic.net wrote:

Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org

Post generated using Mail2Forum (mail2forum.com)