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


Hi Mat,

On Thu, Jun 20, 2013 at 11:46:51PM +0200, Mat M wrote:
Mind to merge my patch, please ?
http://nabble.documentfoundation.org/LibreOffice-Gerrit-News-2013-06-17-tp4061810p4062117.html

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:
   /home/bjoern/checkouts/dev-tools/.git/rebase-apply/patch
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:
 
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=commit;h=ef48d775c8baa039e2f16ef7da928d99c2c27994
(which accidentally added a compiled pyc file as I had to manually merge and
apply that one)

Best,

Bjoern

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.