[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: automatic handling of staging
From: |
David Kastrup |
Subject: |
Re: automatic handling of staging |
Date: |
Thu, 17 Nov 2011 09:36:51 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.90 (gnu/linux) |
Peekay Ex <address@hidden> writes:
> This is from the terminal (run at about 06:45 BST today)
>
> --snip--
> address@hidden:~/Desktop$ python compile_lilypond_test.py
> Branch test-master-lock set up to track remote branch master from
> origin.
lock created
> Branch test-staging set up to track remote branch staging from origin.
Reference for staging created (not sure whether one really needs that,
I'll have to experiment a bit).
> Initialized empty Git repository in
> /home/jlowe/patchy/src-2011-11-17-06/.git/
Made a copy of the repository in order not to disturb work in your original.
> Updating 6381b50..0846249
> Fast-forward
> lily/parser.yy | 85
> +++++++++++++++++++++++---------------------------------
> 1 files changed, 35 insertions(+), 50 deletions(-)
> Total 0 (delta 0), reused 0 (delta 0)
Advanced master in that copy to staging.
> To /home/jlowe/lilypond-git
> 6381b50..0846249 test-master-lock -> test-master-lock
> Total 0 (delta 0), reused 0 (delta 0)
Transferred the advanced test-master-lock to the main repository.
Presumably silently did the testing.
> To ssh://address@hidden/srv/git/lilypond.git
> 6381b50..0846249 test-master-lock -> master
Pushed it upstream.
> warning: deleting branch 'test-master-lock' that has been merged to
> 'refs/remotes/origin/master', but it is not yet merged to HEAD.
> Deleted branch test-master-lock (was 0846249).
Deleted the lock file. Perhaps we should use -D instead of -d to avoid
the warning (and avoid problems when it has _not_ been pushed).
> address@hidden:~/Desktop$
> I haven' done any manual pushing or checking in git as I have to leave
> for work now.
It has been done automatically anyway.
> Hope this was ok.
Looks as it should.
--
David Kastrup