[ANN] gerrit daily digest active, please add yourself to watched projects, gerrit firehose ends 2013-06-17 0000UTC

Mat M matm at gmx.fr
Fri Jun 21 16:11:00 PDT 2013


Le Fri, 21 Jun 2013 10:50:42 +0200, Bjoern Michaelsen  
<bjoern.michaelsen at canonical.com> a écrit:

> 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:

Sorry! I git-pulled before doing the changes and started from commit  
073e1c2f3ae from Lubos.
Maybe my workdir was not clean.

> 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.

haaaa! Still forgot gerrit is also working for dev-tools. Sincere  
apologies !

> 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

Mat M

More information about the LibreOffice mailing list