On Wed, 16 Feb 2011, Frederic Bouvier wrote: >> By the way, I committed the changes to releases/2.2.0 and then merged that >> branch into next. This is the way fixes should move between the two >> branches. Please don't commit a fix to next and then cherry-pick it to the >> release branch. It is very messy to have the same change committed on >> several different branches. > > I tried that on the data repo without luck. Many Aircraft are removed > for the release, and merging propagate that in master. > > Recovering my local workspace now...
Yes, for fgdata merging back from the 2.2.0 branch will not work. I'm a bit at loss why the 2.2.0 branch was reduced to contain only the data package contents instead of being a snapshot of everything to be included in the release - presumably there will be archives for the download page generated also for the aircraft removed in the 2.2.0 branch. Hopefully their state in master will still be 2.2.0 compatible at that time.. For the next release maybe we could create two release branches in data 2.x.0-full and 2.x.0-datapackage, where the first serves as the full data release and the latter whatever purpose (snapshot generation?) the 2.2.0 branch serves now. Cheers, Anders -- --------------------------------------------------------------------------- Anders Gidenstam WWW: http://www.gidenstam.org/FlightGear/ ------------------------------------------------------------------------------ The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
