On Fri, Nov 04, 2011 at 03:08:40PM +0000, Adam Spiers wrote: > OK, thanks. Next question - any ideas what's going on here? > > $ git cl upload origin/dev/staging > scripts/build/output-distance.py | 65 ++++++++++++++++++++++++++++++------- > 1 files changed, 52 insertions(+), 13 deletions(-) > Waiting for Emacs... > No output from ['hg', 'parent', '-q']
You've got $VISUAL set to emacs, which apparently isn't playing nice with the git-cl script? Just for the lulz, try doing VISUAL=nano git cl upload and see what happens. > Also, please let me know if I'm incorrectly assuming I should be using > dev/staging as the reference branch rather than master. 1) I think your above command is trying to upload the difference between origin/dev/staging and origin/master. I could be wrong, but that's how I think git-cl works. 2) use master as the reference branch. Your patch will get pushed to dev/staging, but base your work off of master. Ideally, dev/staging just introduces a slight delay (up to 12 hours?) to make sure that commits actually compile before moving them into master. The idea is that the shared master should always compile, so that everybody can do work. Before dev/staging, git master became un-compilable approximately once a month, causing all sorts of panic amongst not-so-technically-include contributors. Social solutions weren't working, so we're trying this technical solution to stop people from pushing junk to master. - Graham _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
