On Mon, Jan 17, 2011 at 8:07 PM, Torsten Dreyer wrote:
> Hi all,
> I just pushed a bugfix to SGMisc::normalizePeriodic(min,max,value).
> The method allways returned zero for values less than min instead of
> normalizing these values into the given period.
>
Excellent catch! As so often: when "complex" things work, then simple things
fail (such as a max/min range check)...
> I think this should also go into the 2.2.0 branch - if I only knew how
> to...
>
> I think so, too. Try this for simgear:
# create local 2.2.0 branch
git branch releases/2.2.0 origin/releases/2.2.0
# switch branch
git checkout releases/2.2.0
# merge current next into 2.2.0 release (ok right _now_, since there are no
simgear commits _yet_
# which mustn't go to the release - otherwise pick&apply patch manually)
git merge next
# push local branch to remote branch...
git push g...@gitorious.org:fg/simgear.git releases/2.2.0:releases/2.2.0
# back to next (don't forget! :) )
git checkout next
It should work. However, admittedly I have slightly messed up my first
attempt to push to the FG/2.2.0 branch yesterday. So maybe I shouldn't start
teaching GIT today... :)
cheers,
Thorsten
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
