[Libreoffice-qa] [ANN] gerrit daily digest active, please add yourself to watched projects, gerrit firehose ends 2013-06-17 0000UTC
bjoern.michaelsen at canonical.com
Fri Jun 21 01:50:42 PDT 2013
On Thu, Jun 20, 2013 at 11:46:51PM +0200, Mat M wrote:
> Mind to merge my patch, please ?
> Thank you :)
That patch doesnt apply cleanly as you created it against an outdated version:
Applying: Update itemization's output
error: patch failed: gerritbot/send-daily-digest:27
error: gerritbot/send-daily-digest: patch does not apply
Patch failed at 0001 Update itemization's output
The copy of the patch that failed is found in:
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
PLEASE: Next time, instead of attaching a plain patch to a mail, please just
push to gerrit, as that saves a lot of such avoidable trouble, esp. when
patches do not cleanly apply on master.
Anyway, pushed and deployed as:
(which accidentally added a compiled pyc file as I had to manually merge and
apply that one)
More information about the Libreoffice-qa