[Flightgear-devel] ..missing ‘EOF’ declaration around fgfs/flightgear/utils/fgai/fgai.cxx:532:59: ?
Hi, ..looks like I was caught in the middle of something: [ 97%] Building CXX object utils/fgai/CMakeFiles/fgai.dir/HLAAircraftClass.cxx.o /home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx: In function ‘int main(int, char**)’: /home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx:532:59: error: ‘EOF’ was not declared in this scope ..I'm guessing the next 2 "logbuf not declared" messages, are consequenses from the above error. /home/arnt/FG-git/simgear/simgear FGFS ** flightgear exists already. Already on 'next' Already up-to-date. [ 0%] [ 0%] Built target js_demo Built target fgjs [ 5%] Built target yasim-proptest [ 10%] Built target yasim [ 10%] Built target metar [ 11%] Built target terrasync [ 27%] Built target JSBSim [ 27%] [ 33%] Built target fgelev Built target fgviewer [ 33%] Built target GPSsmooth [ 34%] Built target MIDGsmooth [ 34%] Built target UGsmooth [ 34%] Built target FGAdminUI [ 34%] Building CXX object utils/fgai/CMakeFiles/fgai.dir/fgai.cxx.o [ 96%] Built target fgfs [ 97%] Built target fgadmin [ 97%] Building CXX object utils/fgai/CMakeFiles/fgai.dir/HLAAircraftClass.cxx.o /home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx: In function ‘int main(int, char**)’: /home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx:532:59: error: ‘EOF’ was not declared in this scope /home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx:550:13: error: ‘logbuf’ has not been declared /home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx:551:13: error: ‘logbuf’ has not been declared make[2]: *** [utils/fgai/CMakeFiles/fgai.dir/fgai.cxx.o] Error 1 make[2]: *** Waiting for unfinished jobs make[1]: *** [utils/fgai/CMakeFiles/fgai.dir/all] Error 2 make: *** [all] Error 2 [ 0%] Built target fgjs [ 0%] Built target js_demo [ 5%] Built target yasim [ 10%] Built target yasim-proptest [ 26%] Built target JSBSim [ 88%] Built target fgfs [ 88%] Built target metar [ 89%] Built target terrasync [ 95%] Built target fgviewer [ 95%] Built target fgelev [ 95%] Built target GPSsmooth [ 96%] Built target MIDGsmooth [ 96%] Built target UGsmooth [ 96%] Built target FGAdminUI [ 97%] Built target fgadmin [ 97%] Building CXX object utils/fgai/CMakeFiles/fgai.dir/fgai.cxx.o /home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx: In function ‘int main(int, char**)’: /home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx:532:59: error: ‘EOF’ was not declared in this scope /home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx:550:13: error: ‘logbuf’ has not been declared /home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx:551:13: error: ‘logbuf’ has not been declared make[2]: *** [utils/fgai/CMakeFiles/fgai.dir/fgai.cxx.o] Error 1 make[1]: *** [utils/fgai/CMakeFiles/fgai.dir/all] Error 2 make: *** [all] Error 2 * FGO ** -- ..med vennlig hilsen = with Kind Regards from Arnt Karlsen ...with a number of polar bear hunters in his ancestry... Scenarios always come in sets of three: best case, worst case, and just in case. -- Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] MSVC compile fail with simgear commit 45ae3978f6109d425e17f58eae543543f304ef93
-Original Message- From: James Turner Sent: Thursday, February 07, 2013 5:41 PM To: FlightGear developers discussions Subject: Re: [Flightgear-devel] MSVC compile fail with simgear commit 45ae3978f6109d425e17f58eae543543f304ef93 On 7 Feb 2013, at 17:26, Alan Teeder wrote: > Just a heads up I´m afraid. > > I haven´t tried to compile the matching Flightgear update. Yep, unfortunately this is the kind of commit that needs a bit of iteration to get correct on every platform. James Good news - simgear now OK Bad news - flightgear not OK I did a cmake generate before compiling simgear, and then before compiling flightgear. It happens. To be honest I don´t know how you guys cope with this kind of situation. I take my hat off to you. Alan 1>-- Build started: Project: ZERO_CHECK, Configuration: Release Win32 -- 2>-- Build started: Project: fgfs, Configuration: Release Win32 -- 3>-- Skipped Build: Project: uninstall, Configuration: Release Win32 -- 3>Project not selected to build for this solution configuration 2> bootstrap.cxx 2>..\..\..\src\Main\bootstrap.cxx(128): error C2653: 'logbuf' : is not a class or namespace name 2>..\..\..\src\Main\bootstrap.cxx(128): error C3861: 'has_no_console': identifier not found 2> locale.cxx 2>..\..\..\src\Main\locale.cxx(61): error C2065: 'LOCALE_USER_DEFAULT' : undeclared identifier 2>..\..\..\src\Main\locale.cxx(62): error C2065: 'LOCALE_SISO639LANGNAME' : undeclared identifier 2>..\..\..\src\Main\locale.cxx(61): error C3861: 'GetLocaleInfo': identifier not found 2>..\..\..\src\Main\locale.cxx(68): error C2065: 'LOCALE_USER_DEFAULT' : undeclared identifier 2>..\..\..\src\Main\locale.cxx(69): error C2065: 'LOCALE_SISO3166CTRYNAME' : undeclared identifier 2>..\..\..\src\Main\locale.cxx(68): error C3861: 'GetLocaleInfo': identifier not found 2> gui_funcs.cxx 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(56): error C2065: 'HDROP' : undeclared identifier 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(56): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(59): error C2144: syntax error : 'int' should be preceded by ';' 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(59): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(59): error C2146: syntax error : missing ';' before identifier 'STDAPICALLTYPE' 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(59): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(59): error C2146: syntax error : missing ';' before identifier 'DragQueryFileA' 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(59): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(59): error C2065: 'HDROP' : undeclared identifier 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(59): error C2146: syntax error : missing ')' before identifier 'hDrop' 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(59): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(59): error C2059: syntax error : ')' 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(61): error C2144: syntax error : 'int' should be preceded by ';' 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(61): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(61): error C2086: 'int EXTERN_C' : redefinition 2> C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(59) : see declaration of 'EXTERN_C' 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(61): error C2146: syntax error : missing ';' before identifier 'STDAPICALLTYPE' 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(61): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(61): error C2146: syntax error : missing ';' before identifier 'DragQueryFileW' 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(61): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int 2>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include\shellapi.h(61): error C2086: 'int STDAPICAL
Re: [Flightgear-devel] Checklists enhancement
Hi Stuart, one request I would like to place is to automatically spread the checklist over multiple pages if it gets longer than, say 20 lines. Especially the complex birds tend to have long checklists ;-) Cheers, Gijs -- Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Checklists enhancement
On Wed, Jan 30, 2013 at 2:41 PM, James Turner wrote: >> I'm thinking of combining this with the tutorial system so you can >> have a virtual co-pilot go through the checklist, calling out the >> items for you to complete. >> >> I'd be interested to hear if those who like flying heavy iron think >> this would be a useful function. > > Categorically yes - the checklists are already nice for the 737NG, and > the big iron has far greater need for the tutorials - starting the Connie or > similar is quite some work :) This is now added. Tutorials are now generated for all checklists at runtime. They are pretty basic, but it's a nice "freebie". One future enhancement i've just thought off might be to enhance the checklist so that an item can have a marker associated with it as we have with tutorials. A user could then click on a checklist item to have the appropriate cockpit control highlighted. This further blurs the line between the checklist and tutorial functions, but users might find the self-pacing aspect of checklists easier to use than the forced pace of the tutorial. Useful? Taking things a bit too far? -Stuart -- Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] MSVC compile fail with simgear commit 45ae3978f6109d425e17f58eae543543f304ef93
On 7 Feb 2013, at 17:26, Alan Teeder wrote: > Just a heads up I´m afraid. > > I haven´t tried to compile the matching Flightgear update. Yep, unfortunately this is the kind of commit that needs a bit of iteration to get correct on every platform. James -- Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
[Flightgear-devel] MSVC compile fail with simgear commit 45ae3978f6109d425e17f58eae543543f304ef93
Just a heads up I´m afraid. I haven´t tried to compile the matching Flightgear update. Alan 3> logstream.cxx 3>C:\FlightGear\simgear\simgear\debug\logstream.cxx(99): error C3861: 'AllocConsole': identifier not found 9>-- Build started: Project: openal_test4, Configuration: Release Win32 -- 10>-- Build started: Project: openal_test3, Configuration: Release Win32 -- 11>-- Build started: Project: openal_test2, Configuration: Release Win32 -- 12>-- Build started: Project: test_cppbind, Configuration: Release Win32 -- 10>SimGearScene.lib(sample_group.obj) : error LNK2019: unresolved external symbol "public: void __thiscall logstream::log(enum sgDebugClass,enum sgDebugPriority,char const *,int,class std::basic_string,class std::allocator > const &)" (?log@logstream@@QAEXW4sgDebugClass@@W4sgDebugPriority@@PBDHABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z) referenced in function "private: void __thiscall SGSampleGroup::start_playing_sample(class SGSoundSample *)" (?start_playing_sample@SGSampleGroup@@AAEXPAVSGSoundSample@@@Z) 10>SimGearScene.lib(soundmgr_openal.obj) : error LNK2001: unresolved external symbol "public: void __thiscall logstream::log(enum sgDebugClass,enum sgDebugPriority,char const *,int,class std::basic_string,class std::allocator > const &)" (?log@logstream@@QAEXW4sgDebugClass@@W4sgDebugPriority@@PBDHABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z) 10>SimGearScene.lib(sample_openal.obj) : error LNK2001: unresolved external symbol "public: void __thiscall logstream::log(enum sgDebugClass,enum sgDebugPriority,char const *,int,class std::basic_string,class std::allocator > const &)" (?log@logstream@@QAEXW4sgDebugClass@@W4sgDebugPriority@@PBDHABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z) 10>C:\FlightGear\simgear\build\simgear\sound\Release\openal_test3.exe : fatal error LNK1120: 1 unresolved externals 12>cppbind_test.obj : error LNK2019: unresolved external symbol "public: void __thiscall logstream::log(enum sgDebugClass,enum sgDebugPriority,char const *,int,class std::basic_string,class std::allocator > const &)" (?log@logstream@@QAEXW4sgDebugClass@@W4sgDebugPriority@@PBDHABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z) referenced in function "protected: void __thiscall nasal::internal::GhostMetadata::addDerived(class nasal::internal::GhostMetadata const *)" (?addDerived@GhostMetadata@internal@nasal@@IAEXPBV123@@Z) 12>SimGearCore.lib(terrasync.obj) : error LNK2001: unresolved external symbol _svn_client_version 12>SimGearCore.lib(terrasync.obj) : error LNK2001: unresolved external symbol _svn_subr_version 12>SimGearCore.lib(terrasync.obj) : error LNK2019: unresolved external symbol __imp__apr_palloc@8 referenced in function "private: static int __cdecl simgear::SGTerraSync::SvnThread::svnClientSetup(void)" (?svnClientSetup@SvnThread@SGTerraSync@simgear@@CAHXZ) 12>SimGearCore.lib(terrasync.obj) : error LNK2019: unresolved external symbol _svn_cmdline_create_auth_baton referenced in function "private: static int __cdecl simgear::SGTerraSync::SvnThread::svnClientSetup(void)" (?svnClientSetup@SvnThread@SGTerraSync@simgear@@CAHXZ) 12>SimGearCore.lib(terrasync.obj) : error LNK2019: unresolved external symbol __imp__apr_hash_get@12 referenced in function "private: static int __cdecl simgear::SGTerraSync::SvnThread::svnClientSetup(void)" (?svnClientSetup@SvnThread@SGTerraSync@simgear@@CAHXZ) 12>SimGearCore.lib(terrasync.obj) : error LNK2019: unresolved external symbol _svn_config_get_config referenced in function "private: static int __cdecl simgear::SGTerraSync::SvnThread::svnClientSetup(void)" (?svnClientSetup@SvnThread@SGTerraSync@simgear@@CAHXZ) 12>SimGearCore.lib(terrasync.obj) : error LNK2019: unresolved external symbol _svn_client_create_context referenced in function "private: static int __cdecl simgear::SGTerraSync::SvnThread::svnClientSetup(void)" (?svnClientSetup@SvnThread@SGTerraSync@simgear@@CAHXZ) 12>SimGearCore.lib(terrasync.obj) : error LNK2019: unresolved external symbol _svn_config_ensure referenced in function "private: static int __cdecl simgear::SGTerraSync::SvnThread::svnClientSetup(void)" (?svnClientSetup@SvnThread@SGTerraSync@simgear@@CAHXZ) 12>SimGearCore.lib(terrasync.obj) : error LNK2019: unresolved external symbol _svn_ra_initialize referenced in function "private: static int __cdecl simgear::SGTerraSync::SvnThread::svnClientSetup(void)" (?svnClientSetup@SvnThread@SGTerraSync@simgear@@CAHXZ) 12>SimGearCore.lib(terrasync.obj) : error LNK2019: unresolved external symbol _svn_cmdline_handle_exit_error referenced in function "private: static int __cdecl simgear::SGTerraSync::SvnThread::svnClientSetup(void)" (?svnClientSetup@SvnThread@SGTerraSync@simgear@@CAHXZ) 12>SimGearCore.lib(terrasync.obj) : error LNK2019: unresolved external symbol _svn_ver_check_list referenced in function "private: static int __cdecl
Re: [Flightgear-devel] Howto modify release branch?
On 7 Feb 2013, at 10:35, Renk Thorsten wrote: > I would much appreciate if you could take care of the issue, and also of Done. James -- Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Howto modify release branch?
> If you want all of them you should be able to cherry-pick the commits _in > order_ or, alternatively, you could just checkout the final state of the > files from master as you suggested above. I can't cherry-pick them no matter what order I try. Basically I want commit 0b8c17ba7437cb09c40c375419b36e38446d1b64 Author: Thorsten Renk Date: Wed Feb 6 13:48:45 2013 +0200 Bugfix for water flickering problem in Atmospheric Light Scattering commit dd678c2f8c5613fc600d88fae9faad3a516b5bc0 Author: Thorsten Renk Date: Mon Feb 4 14:52:14 2013 +0200 Bugfix for lower quality water shader in Atmospheric Light Scattering which should be equivalent to getting Effects/water.eff Shaders/water_lightfield.frag Shaders/water_lightfield_lr.frag from the master branch. I can check them out fine, but I just discovered I can't actually test that the changes run fine without building a release binary as well - so this grows over my head rather quickly... > I'm happy to do mechanical work here (and have been, in general), but I > can't separate inter-dependant commits when picking, only the author can > / should do that. I would much appreciate if you could take care of the issue, and also of commit 25bffb0d2344549dbb1647a2965fac275891da6d Author: Thorsten Renk Date: Mon Feb 4 15:19:58 2013 +0200 Bugfix for airport grass shader which is equivalent of just checking out Shaders/airfield.frag from master. Thanks, * Thorsten -- Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Howto modify release branch?
Renk Thorsten wrote: > Sorry, I don't want to mess up the release branch, and I would much > appreciate a helping hand here. Would you just tell us what commits from master you want in the release branch? Of course, yes, if the commit you cherry-picked is based on another one, that won't work without manual merging. So either first cherry-pick the first commit and then the second one, or, if this would bring in too much changes, merge the second commit manually (by resolving the conflict git tells you about). Chris -- Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Howto modify release branch?
On Thu, 7 Feb 2013, Renk Thorsten wrote: > Okay, as usualy this is not so simple... I get > > git cherry-pick dd678c2f8c5613fc600d88fae9faad3a516b5bc0 > > error: could not apply dd678c2... Bugfix for lower quality water shader in > Atmospheric Light Scattering > hint: after resolving the conflicts, mark the corrected paths > hint: with 'git add ' or 'git rm ' > hint: and commit the result with 'git commit' > > > I think I understand the problem, because there's a second bugfix > having to do with water later on the master branch, so presumably if I > would have pushed the changes to both branches right away it wouldn't > have made any problems, but I don't know how to resolve this properly > now. Should I simply checkout the files from master I need rather than > cherry-pick? Or edit them? Does that matter for the history in the end? > > Sorry, I don't want to mess up the release branch, and I would much > appreciate a helping hand here. Ok, so you have multiple commits on master modifying the same file(s) since the branch was cut? If you don't want all of those changes you need to do cherry-picking and resolve the conflicts by hand. If you want all of them you should be able to cherry-pick the commits _in order_ or, alternatively, you could just checkout the final state of the files from master as you suggested above. To get your local release branch back in order $ git reset --hard should do (but that I think you knew already). Cheers, Anders -- --- Anders Gidenstam WWW: http://gitorious.org/anders-hangar http://www.gidenstam.org/FlightGear/ -- Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Howto modify release branch?
On 7 Feb 2013, at 10:08, Renk Thorsten wrote: > I think I understand the problem, because there's a second bugfix having to > do with water later on the master branch, so presumably if I would have > pushed the changes to both branches right away it wouldn't have made any > problems, but I don't know how to resolve this properly now. Should I simply > checkout the files from master I need rather than cherry-pick? Or edit them? > Does that matter for the history in the end? > > Sorry, I don't want to mess up the release branch, and I would much > appreciate a helping hand here. Commits you cherry-pick should be atomic if possible, it sounds as if you have two commits you need to pick, since one depends on the other? If both are applicable for the release branch, then it's fine, simply pick them both. If only the second one is, you have a problem, and really need to edit the commit when cherry-picking, so that it works against the files in the 2.10.0 branch. I'm happy to do mechanical work here (and have been, in general), but I can't separate inter-dependant commits when picking, only the author can / should do that. James -- Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Howto modify release branch?
> Something along these lines: > > $ git branch my-2.10.0 origin/release/2.10.0 > > $ git checkout my-2.10.0 > > Find the commit ids of the bug fix commits on the master branch > > $ git log master > > Cherry pick these to your local release branch > > $ git cherry-pick Okay, as usualy this is not so simple... I get git cherry-pick dd678c2f8c5613fc600d88fae9faad3a516b5bc0 error: could not apply dd678c2... Bugfix for lower quality water shader in Atmospheric Light Scattering hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' hint: and commit the result with 'git commit' I think I understand the problem, because there's a second bugfix having to do with water later on the master branch, so presumably if I would have pushed the changes to both branches right away it wouldn't have made any problems, but I don't know how to resolve this properly now. Should I simply checkout the files from master I need rather than cherry-pick? Or edit them? Does that matter for the history in the end? Sorry, I don't want to mess up the release branch, and I would much appreciate a helping hand here. * Thorsten -- Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
