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 with > > git cl issue your_issue_number > > in case git cl is confused, and finally > > git cl upload Everything went fine until this point, but then I get a number of errors: 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 diff"-style arguments, like git cl upload origin/master or verify this branch is set up to track another (via the --track argument to "git checkout -b ..."). david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl upload origin/master input/regression/measure-counter.ly | 41 ++++++++++++ ly/spanners-init.ly | 4 + scm/define-event-classes.scm | 6 +- scm/define-grob-interfaces.scm | 5 ++ scm/define-grob-properties.scm | 1 + scm/define-grobs.scm | 18 +++++ scm/define-music-types.scm | 5 ++ scm/music-functions.scm | 117 +++++++++++++++++++++++++++++++++++ 8 files changed, 194 insertions(+), 3 deletions(-) This branch is associated with issue 2445. Adding patch to that issue. Traceback (most recent call last): File "/home/david/bin/git-cl", line 888, in <module> sys.exit(main(sys.argv)) File "/home/david/bin/git-cl", line 882, in main return func(argv[2:]) File "/home/david/bin/git-cl", line 584, in CmdUpload desc = cl.GetDescription() File "/home/david/bin/git-cl", line 278, in GetDescription self.description = urllib2.urlopen(url).read().strip() File "/usr/lib/python2.6/urllib2.py", line 126, in urlopen return _opener.open(url, data, timeout) File "/usr/lib/python2.6/urllib2.py", line 397, in open response = meth(req, response) File "/usr/lib/python2.6/urllib2.py", line 510, in http_response 'http', request, response, code, msg, hdrs) File "/usr/lib/python2.6/urllib2.py", line 435, in error return self._call_chain(*args) File "/usr/lib/python2.6/urllib2.py", line 369, in _call_chain result = func(*args) File "/usr/lib/python2.6/urllib2.py", line 518, in http_error_default raise HTTPError(req.get_full_url(), code, msg, hdrs, fp) urllib2.HTTPError: HTTP Error 404: Not Found I have no idea what's going on here :( I don't want to nuke the build directory and start again, branch-free. Hopefully there's another option! -David _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
