Re: [Rails-devel] 1889 game fails

[Erik V. <eri...@xs...>]

I pushed, but what?

Both my current master and origin/master have this code in 1889/Game.xml:
    <TrainType name="6" majorStops="6" cost="630" quantity="2">
          <NewPhase phaseName="6"/>
          <IfOption name="WithOptional6Train" value="yes">
                <Attributes quantity="3"/>
          </IfOption>
     </TrainType>

Which fixed the problem (for me). You don't see that code?
The fix originally was in commit '1048c3' named "All train types now have a
default 'quantity'".  Strange enough that commit is not in the thread
leading to 'master' in my History View.
On the other hand, the master has that mysterious "Merge branch 'master' of
..." commit that shows my complete SSL login (can that be changed or
removed?).  

What did I do wrong?  I did the fixing in a separate branch that I later
merged it into master, or that is what I thought I did at the time.
It seems I still haven't completely mastered the art of merging in Git....

Erik.

> -----Original Message-----
> From: Stefan Frey [mailto:ste...@we...]
> Sent: Wednesday, August 03, 2011 7:24 AM
> To: Development list for Rails: an 18xx game
> Subject: Re: [Rails-devel] 1889 game fails
> 
> Erik:
> this game still fails.
> However there was no commit of yours pushed since db9eb8.
> Maybe you forgot to push?
> Stefan
> 
> 
> 
> On Monday, August 01, 2011 05:53:32 pm Erik Vos wrote:
> > The '6' train had no quantity because the Optional6Train option was
> > not set, i.e. it was neither "yes" nor "no".
> >
> > I have checked all games for the presence of a default quantity (and
> > removed any redundant non-overriding option values).
> >
> > This saved game should now work.
> >
> > Erik.
> >
> > > -----Original Message-----
> > > From: Stefan Frey [mailto:ste...@we...]
> > > Sent: Monday, August 01, 2011 7:29 AM
> > > To: 'Development list for Rails: an 18xx game'
> > > Subject: [Rails-devel] 1889 game fails
> > >
> > > Erik,
> > > one of the 1889 test files fails with an configuration error.
> > > It seems that this is related to the new train management.
> > > Could you check this?
> > > Thanks,
> > > Stefan
> >
> >
---------------------------------------------------------------------------
> > --- Got Input?   Slashdot Needs You.
> > Take our quick survey online.  Come on, we don't ask for help often.
> > Plus, you'll get a chance to win $100 to spend on ThinkGeek.
> > http://p.sf.net/sfu/slashdot-survey
> > _______________________________________________
> > Rails-devel mailing list
> > Rai...@li...
> > https://lists.sourceforge.net/lists/listinfo/rails-devel
> 
>
----------------------------------------------------------------------------
--
> BlackBerry&reg; DevCon Americas, Oct. 18-20, San Francisco, CA The must-
> attend event for mobile developers. Connect with experts.
> Get tools for creating Super Apps. See the latest technologies.
> Sessions, hands-on labs, demos & much more. Register early & save!
> http://p.sf.net/sfu/rim-blackberry-1
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel