Re: [cmake-developers] git help and bug fixes

2010-06-18 Thread Brad King
James Bigler wrote: > Do I have to ask someone to merge it, or will it be done without asking? It will be done without asking. We have weekly "merge meetings", usually on Tuesdays, to merge work done the previous week. -Brad ___ cmake-developers mailin

Re: [cmake-developers] git help and bug fixes

2010-06-18 Thread James Bigler
On Tue, Jun 15, 2010 at 5:27 AM, Brad King wrote: > Mathieu Malaterre wrote: > > On Tue, Jun 15, 2010 at 8:23 AM, James Bigler > wrote: > >> Now, according to the wiki, I should also push this change into master, > >> right? > > > > Same question for me ? I tried pushing the exact same changes o

Re: [cmake-developers] git help and bug fixes

2010-06-15 Thread Brad King
James Bigler wrote: > OK, so this is what I ended up doing: > > 516 git branch topics/FixCudaVersionAfterFirstRun > 0d30e3fe91717f519722a71470a5180c13818a2a > 518 git checkout -b next origin/next > 520 git pull > 526 git merge topics/FixCudaVersionAfterFirstRun > 528 git push -> fa

Re: [cmake-developers] git help and bug fixes

2010-06-15 Thread Brad King
Mathieu Malaterre wrote: > On Tue, Jun 15, 2010 at 8:23 AM, James Bigler wrote: >> Now, according to the wiki, I should also push this change into master, >> right? > > Same question for me ? I tried pushing the exact same changes onto > master (after success on 'ext'), but now it fails with: >

Re: [cmake-developers] git help and bug fixes

2010-06-15 Thread Mathieu Malaterre
On Tue, Jun 15, 2010 at 8:23 AM, James Bigler wrote: > On Fri, Jun 4, 2010 at 11:12 AM, Brad King wrote: >> >> James Bigler wrote: >> > 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

Re: [cmake-developers] git help and bug fixes

2010-06-14 Thread James Bigler
On Fri, Jun 4, 2010 at 11:12 AM, Brad King wrote: > James Bigler wrote: > > 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?

Re: [cmake-developers] git help and bug fixes

2010-06-04 Thread Brad King
James Bigler wrote: > 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? Yes to both. Please start the topic from master, commit, and

Re: [cmake-developers] git help and bug fixes

2010-06-04 Thread James Bigler
On Tue, Jun 1, 2010 at 11:37 PM, Michael Wild 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 fcd7a1

Re: [cmake-developers] git help and bug fixes

2010-06-01 Thread Michael Wild
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: Jame

[cmake-developers] git help and bug fixes

2010-06-01 Thread James Bigler
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 Date: Tue Jun 1 21:27:19 2010 -0600 Merge branch '