<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Hello</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">moarvm repo had a small issue:</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;">$ git push --all </span><span style=" font-family:'monospace';"><br />Counting objects: 130, done. <br />Delta compression using up to 8 threads. <br />Compressing objects: 100% (127/127), done. <br />Writing objects: 100% (130/130), 92.28 KiB | 0 bytes/s, done. <br />Total 130 (delta 111), reused 0 (delta 0) <br />error: there are still refs under 'refs/heads/upstream' <br />remote: error: failed to lock refs/heads/upstream <br />To git+ssh://git.debian.org/git/pkg-rakudo/pkg-moarvm.git <br />  fc7f4be..bb28b7f  master -> master <br />  0d756c9..d42847e  pristine-tar -> pristine-tar <br />* [new branch]      copyright-cme-update -> copyright-cme-update <br />! [remote rejected] upstream -> upstream (failed to lock) <br />error: failed to push some refs to 'git+ssh://git.debian.org/git/pkg-rakudo/pkg-moarvm.git'<br /><br />Turns out that remote upstream branch was messed up:</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;">$ git branch -r </span><span style=" font-family:'monospace';"><br /> </span><span style=" font-family:'monospace'; color:#b21818; background-color:#ffffff;">origin/HEAD</span><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;"> -> origin/master </span><span style=" font-family:'monospace';"><br /> </span><span style=" font-family:'monospace'; color:#b21818; background-color:#ffffff;">origin/copyright-cme-update</span><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;"> </span><span style=" font-family:'monospace';"><br /> </span><span style=" font-family:'monospace'; color:#b21818; background-color:#ffffff;">origin/master</span><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;"> </span><span style=" font-family:'monospace';"><br /> </span><span style=" font-family:'monospace'; color:#b21818; background-color:#ffffff;">origin/pristine-tar</span><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;"> </span><span style=" font-family:'monospace';"><br /> </span><span style=" font-family:'monospace'; color:#b21818; background-color:#ffffff;">origin/test/libffi</span><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;"> </span><span style=" font-family:'monospace';"><br /> </span><span style=" font-family:'monospace'; color:#b21818; background-color:#ffffff;">origin/upstream/master</span><span style=" font-family:'monospace';"><br /><br />The remote branch must be "origin/upstream" without trailing "/master".</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" font-family:'monospace';">I've deleted the bad remote branch and created a correct one.</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" font-family:'monospace';">But you may have to change your local repo to use the new upstream remote branch with the following command:</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;">git branch --set-upstream-to=remotes/origin/upstream upstream</span><span style=" font-family:'monospace';"><br /></span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" font-family:'monospace';">Please get back to me if I missed something.</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">All the best</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">-- </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> https://github.com/dod38fr/   -o- http://search.cpan.org/~ddumont/</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">http://ddumont.wordpress.com/  -o-   irc: dod at irc.debian.org</p></body></html>