On Tue, Jun 1, 2010 at 11:37 PM, Michael Wild <[email protected]> wrote:
> > On 2. Jun, 2010, at 6:47 , James Bigler wrote: > > > I have a change I made to master that I didn't push before we changed to > the > > New World Order: > > > > $ git branch > > * master > > $ git log origin/master..master > > commit fcd7a1edcb414a6050dbbcefc0f786143b7fba8a > > Merge: 0d30e3f 7f61960 > > Author: James Bigler <[email protected]> > > Date: Tue Jun 1 21:27:19 2010 -0600 > > > > Merge branch 'master' of git://cmake.org/cmake > > > > commit 0d30e3fe91717f519722a71470a5180c13818a2a > > Author: James Bigler <[email protected]> > > Date: Wed May 12 16:38:51 2010 -0600 > > > > Fixed: CUDA_VERSION_MAJOR/MINOR now computed after first run. > > > > CUDA_VERSION_MAJOR and CUDA_VERSION_MINOR were only computed when > > CUDA_VERSION was first > > computed. Subsequent runs of FindCUDA would not have > > CUDA_VERSION_MAJOR/MINOR set. We > > now extract the major and minor versions from the CUDA_VERSION cache > > variable every run. > > > > =================================== > > Question: How do I make a topic branch out of this change? > > > > # Option 1: > # > # Create a new topic branch whose HEAD is the commit you want > git branch topics/FixCudaVersion 0d30e3fe91717f519722a71470a5180c13818a2a > > > # Option 2: > # > # If your master branch has other local commits which you don't want > # to be present in your topic branch, you can either do this: > git branch topics/FixCudaVersion origin/master > git checkout topics/FixCudaVersion > git cherry-pick 0d30e3fe91717f519722a71470a5180c13818a2a > > # Option 3: > # > # Or you could do an interactive rebase onto origin/master > git branch topics/FixCudaVersion 0d30e3fe91717f519722a71470a5180c13818a2a > git checkout topics/FixCudaVersion > git rebase -i origin/master > # follow the instructions in the file that should pop up in your favorite > editor... > > # You then can reset your master if you like to > # BEWARE, THIS MIGHT DESTROY INFORMATION! > git checkout master > git reset --hard origin/master > # the HEAD of master is now at the same commit as origin/master is. > > > Question: Do I need to push this change to "next"? > > > > Question: If this is a bug fix, will the release manager push it into > 2.8.2 > > at some point? > > > I'll leave the rest of the question for someone from Kitware to answer > since I have no idea (e.g. do you have commit-rights?). > > HTH > > Michael > > Thanks Michael. I'll try these suggestions. CMake devs, could you comment on my last two questions? * Question: Do I need to push this change to "next"? * Question: If this is a bug fix, will the release manager push it into 2.8.2 at some point? James
_______________________________________________ cmake-developers mailing list [email protected] http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
