Attempting to push a single patch, using the directions in CG 3.4.11, I
get the console output appended. I haven't attempted anything since, and
would be grateful for guidance from the gurus. Online research suggests
either permission errors on the savannah repo, space issues at savannah,
or corruption either locally or on the remote. Both my local repo and
savannah seem perfectly normal when I look around with gitk, so I'm
turning to the assembled wisdom for the next steps I need to take.
Cheers,
Colin
colin@Sherlock ~/lilypond-git (dev/local_working)$ git checkout staging
Branch staging set up to track remote branch staging from origin.
Switched to a new branch 'staging'
colin@Sherlock ~/lilypond-git (staging)$ git pull -r
remote: Counting objects: 825, done.
remote: Compressing objects: 100% (170/170), done.
remote: Total 494 (delta 413), reused 390 (delta 324)
Receiving objects: 100% (494/494), 351.62 KiB | 359.00 KiB/s, done.
Resolving deltas: 100% (413/413), completed with 287 local objects.
From git://git.sv.gnu.org/lilypond
a577554..f4abbff staging -> origin/staging
a577554..f4abbff master -> origin/master
8a50484..730d4eb translation -> origin/translation
First, rewinding head to replay your work on top of it...
Fast-forwarded staging to f4abbfff5f0d985a457e15586dbcc3ae473b0dee.
colin@Sherlock ~/lilypond-git (staging)$ git merge local_working
merge: local_working - not something we can merge
colin@Sherlock ~/lilypond-git (staging)$ git merge dev/local_working
Merge made by the 'recursive' strategy.
Documentation/web/introduction.itexi | 84
+++++++++++++++++++++-----------------------
1 file changed, 41 insertions(+), 43 deletions(-)
colin@Sherlock ~/lilypond-git (staging)$ gitk
colin@Sherlock ~/lilypond-git (staging)$ git push origin staging
Counting objects: 34, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 1.23 KiB | 0 bytes/s, done.
Total 8 (delta 6), reused 0 (delta 0)
error: unpack failed: unpack-objects abnormal exit
To git://git.sv.gnu.org/lilypond.git
! [remote rejected] staging -> staging (n/a (unpacker error))
error: failed to push some refs to 'git://git.sv.gnu.org/lilypond.git'
--
I've learned that you shouldn't go through life with a catcher's mitt on both
hands.
You need to be able to throw something back.
-Maya Angelou, poet (1928- )
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
