Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


Hi,
I found some unreviewed patches of mine and also a patch ( some commits in the past ) in master that I just wanted to promote for review in 3.6, it seems that easiest way was to use the mail interface to ask for a cherry-pick ( or at least I didn't see anything else appropriate on the wiki ) Is that right, is there no command line interface to do similar? is there a better way to do that?

After I did that I noticed I was getting spammed by gerrit with "[CHANGEUPLOAD FAILED] [CHERRYPICK] commit blah blah blah for branch libreoffice-3-6" type messages indicating there was some problem ( but I couldn't figure out what the problem was, some example attached, there were some warnings various things and one error with little/no info ) Strangely I did get some "Change in core[libreoffice-3-6]: blah blah blah" messages which I presume meant things worked sometimes even before the corresponding "[CHANGEUPLOAD FAILED] [CHERRYPICK] commit ...." message. Also strange ( to me ) that I don't see any "[PATCH] " messages send to the dev list and I assume the patch *is* actually uploaded as it appears in gerrit. Another annoyance is that the owner of the bug in gerrit ( e.g see https://gerrit.libreoffice.org/#/c/958/ ) is marked as "LibreOffice gerrit bot" instead of the author of the patch.

Is this the expected way that things work? or did I just make a mess of things ( if so would be grateful to know what I should have done for future reference )

Noel
--- Begin Message ---
2012-11-01 16:09:35,192 INFO     Handling incoming mail from Noel Power <nopower@suse.com>
2012-11-01 16:09:35,192 INFO     subject: '[CHERRYPICK] commit 
a705c6cac4182d62c3495be7367d4ae34fd47fac  for
 branch libreoffice-3-6'
2012-11-01 16:09:35,192 INFO     executing command: cherrypick, branch: libreoffice-3-6, commit: 
a705c6cac4182d62c3495be7367d4ae34fd47fac
2012-11-01 16:09:35,245 INFO     Cloning into /tmp/tmpHZMY4L/repo...
2012-11-01 16:18:35,263 INFO     call to "git clone --branch libreoffice-3-6 ssh://logerrit/core 
/tmp/tmpHZMY4L/repo" succeeded.
2012-11-01 16:18:35,290 INFO     call to "git config gc.auto 0" succeeded.
2012-11-01 16:18:35,292 INFO     Fetching origin
2012-11-01 16:18:35,535 INFO     call to "git --work-tree=/tmp/tmpHZMY4L/repo fetch --all" 
succeeded.
2012-11-01 16:18:36,019 WARNING  Already on 'libreoffice-3-6'
2012-11-01 16:18:36,025 INFO     call to "git --work-tree=/tmp/tmpHZMY4L/repo checkout 
libreoffice-3-6" succeeded.
2012-11-01 16:18:37,401 INFO     [libreoffice-3-6 fbd1e10] halt corrupted styles with multi-saved 
xlsx document fdo#55418
2012-11-01 16:18:37,402 INFO      Author: Noel Power <noel.power@suse.com>
2012-11-01 16:18:37,402 INFO      Committer: gerritbot <gerritbot@vm2.documentfoundation.org>
2012-11-01 16:18:37,402 INFO     Your name and email address were configured automatically based
2012-11-01 16:18:37,402 INFO     on your username and hostname. Please check that they are accurate.
2012-11-01 16:18:37,403 INFO     You can suppress this message by setting them explicitly:
2012-11-01 16:18:37,403 INFO     
2012-11-01 16:18:37,403 INFO         git config --global user.name "Your Name"
2012-11-01 16:18:37,403 INFO         git config --global user.email you@example.com
2012-11-01 16:18:37,404 INFO     
2012-11-01 16:18:37,404 INFO     After doing this, you may fix the identity used for this commit 
with:
2012-11-01 16:18:37,404 INFO     
2012-11-01 16:18:37,404 INFO         git commit --amend --reset-author
2012-11-01 16:18:37,404 INFO     
2012-11-01 16:18:37,405 INFO      1 files changed, 4 insertions(+), 1 deletions(-)
2012-11-01 16:18:37,417 INFO     call to "git --work-tree=/tmp/tmpHZMY4L/repo cherry-pick 
a705c6cac4182d62c3495be7367d4ae34fd47fac" succeeded.
2012-11-01 16:18:37,658 WARNING  remote: Resolving deltas:  20% (1/5)           
remote: Resolving deltas:  40% (2/5)           
remote: Resolving deltas:  60% (3/5)           
remote: Resolving deltas:  80% (4/5)           
remote: Resolving deltas: 100% (5/5)           
remote: Resolving deltas: 100% (5/5)        
2012-11-01 16:18:38,403 WARNING  remote: 
remote: Processing changes: updated: 1, refs: 1        
remote: Processing changes: updated: 1, refs: 1, done            
2012-11-01 16:18:38,404 WARNING  To ssh://logerrit/core
2012-11-01 16:18:38,404 WARNING   ! [remote rejected] HEAD -> refs/for/libreoffice-3-6 (no changes 
made)
2012-11-01 16:18:38,404 WARNING  error: failed to push some refs to 'ssh://logerrit/core'
2012-11-01 16:18:38,405 ERROR    call to "git --work-tree=/tmp/tmpHZMY4L/repo push 
ssh://logerrit/core HEAD:refs/for/libreoffice-3-6" returned: 1
2012-11-01 16:18:38,780 INFO     # On branch libreoffice-3-6
2012-11-01 16:18:38,780 INFO     # Your branch is ahead of 'origin/libreoffice-3-6' by 1 commit.
2012-11-01 16:18:38,780 INFO     #
2012-11-01 16:18:38,780 INFO     nothing to commit (working directory clean)
2012-11-01 16:18:38,784 INFO     call to "git --work-tree=/tmp/tmpHZMY4L/repo status" succeeded.
2012-11-01 16:18:40,009 ERROR    "git --work-tree=/tmp/tmpHZMY4L/repo push ssh://logerrit/core 
HEAD:refs/for/libreoffice-3-6" command returned non-null.


--- End Message ---

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.