2010/8/12 Brad King <[email protected]>: > Hi Eric, > > On 08/11/2010 05:47 PM, David Cole wrote: >> The warnings Brad fixed showed up on the Continuous dashboard for CMake >> here: >> http://www.cdash.org/CDash/index.php?project=CMake&date=2010-08-11#Continuous >> <http://www.cdash.org/CDash/index.php?project=CMake&date=2010-08-11#Continuous> > > There is one more on today's dashboard from last night's runs: > > http://www.cdash.org/CDash/viewBuildError.php?type=1&buildid=691787 > > /home/kitware/Dashboards/My Tests/CMake/Source/CPack/cmCPackGenerator.cxx: In > member function 'virtual int > cmCPackGenerator::InstallProjectViaInstalledDirectories(bool, const char*)': > /home/kitware/Dashboards/My > Tests/CMake/Source/CPack/cmCPackGenerator.cxx:348: warning: declaration of > 'files' shadows a member of 'this' > > Please re-start work from where my fixes left off: > > $ git checkout -b CPack-APIredesign 31a313d4 > > Then create a commit to fix these warnings.
I just did that. > You can use the topic > stage ( http://www.cmake.org/Wiki/CMake/Git#Topic_Stage ) to merge > it to next. Sorry I did this too fast, I did merge to next and pushed as usual. It does succeed without trouble, what would have been the advantage of using stage to merge to next ? Did I do something wrong by merging+pushing next without going through stage? -- Erk Membre de l'April - « promouvoir et défendre le logiciel libre » - http://www.april.org _______________________________________________ cmake-developers mailing list [email protected] http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
