Re: problem uploading a patch

2012-10-17 Thread David Nalesnik
David, On Wed, Oct 17, 2012 at 12:44 AM, David Kastrup d...@gnu.org wrote: Try git rebase origin first I tried this, and this is what happened: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git rebase origin fatal: Needed a single revision invalid upstream origin Should I try

Re: problem uploading a patch

2012-10-17 Thread David Nalesnik
Julien, On Wed, Oct 17, 2012 at 1:33 AM, Julien Rioux jri...@physics.utoronto.ca wrote: On 16/10/2012 4:36 PM, David Nalesnik wrote: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl issue 2445 Issue number: 2445 (http://codereview.appspot.com/2445) This should be the issue

Re: problem uploading a patch

2012-10-17 Thread David Kastrup
David Nalesnik david.nales...@gmail.com writes: David, On Wed, Oct 17, 2012 at 12:44 AM, David Kastrup d...@gnu.org wrote: Try git rebase origin first I tried this, and this is what happened: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git rebase origin fatal: Needed a

Re: problem uploading a patch

2012-10-17 Thread David Kastrup
David Nalesnik david.nales...@gmail.com writes: Julien, On Wed, Oct 17, 2012 at 1:33 AM, Julien Rioux jri...@physics.utoronto.ca wrote: On 16/10/2012 4:36 PM, David Nalesnik wrote: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl issue 2445 Issue number: 2445

Re: problem uploading a patch

2012-10-17 Thread David Nalesnik
David, On Wed, Oct 17, 2012 at 8:04 AM, David Kastrup d...@gnu.org wrote: David Nalesnik david.nales...@gmail.com writes: Julien, On Wed, Oct 17, 2012 at 1:33 AM, Julien Rioux jri...@physics.utoronto.ca wrote: On 16/10/2012 4:36 PM, David Nalesnik wrote: david@david-desktop

Re: problem uploading a patch

2012-10-17 Thread Julien Rioux
On 10/17/2012 02:55 PM, David Nalesnik wrote: Julien, On Wed, Oct 17, 2012 at 1:33 AM, Julien Rioux jri...@physics.utoronto.ca wrote: On 16/10/2012 4:36 PM, David Nalesnik wrote: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl issue 2445 Issue number: 2445

Re: problem uploading a patch

2012-10-17 Thread David Nalesnik
Julien, On Wed, Oct 17, 2012 at 9:25 AM, Julien Rioux jri...@physics.utoronto.ca wrote: $ git cl issue 0 to reset (remove any association to a Rietveld issue) $ git cl upload origin/master to upload (given that the branch is no longer associated to a Rietveld issue, it will create a new

problem uploading a patch

2012-10-16 Thread David Nalesnik
Hi, I'm trying to upload a patch created in a branch to Rietveld, but I seem to be creating an unholy mess. I attempted to run git-cl upload master within my branch, but I end up with a huge list of recent commits not my own. The same thing happened when I ran git format-patch master and

Re: problem uploading a patch

2012-10-16 Thread Phil Holmes
- Original Message - From: David Nalesnik david.nales...@gmail.com To: Lilypond Dev lilypond-devel@gnu.org Sent: Tuesday, October 16, 2012 8:56 PM Subject: problem uploading a patch Hi, I'm trying to upload a patch created in a branch to Rietveld, but I seem to be creating an unholy

Re: problem uploading a patch

2012-10-16 Thread David Nalesnik
Hi Phil, On Tue, Oct 16, 2012 at 3:11 PM, Phil Holmes [...] If you have a record of changes you've made, then I tend to use git reset --hard origin/master which takes you back to the current state of master, and then git am your.patch which applies the patch you have. Follow this

Re: problem uploading a patch

2012-10-16 Thread David Nalesnik
Hi Phil. david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl issue 2445 Issue number: 2445 (http://codereview.appspot.com/2445) david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl upload Unable to determine default branch to diff against. Either pass complete git

Re: problem uploading a patch

2012-10-16 Thread David Kastrup
David Nalesnik david.nales...@gmail.com writes: Hi, I'm trying to upload a patch created in a branch to Rietveld, but I seem to be creating an unholy mess. I attempted to run git-cl upload master within my branch, but I end up with a huge list of recent commits not my own. The same thing