[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Solang-devel] [PATCH] Search infrastructure
From: |
Debarshi Ray |
Subject: |
Re: [Solang-devel] [PATCH] Search infrastructure |
Date: |
Sun, 24 May 2009 01:54:08 +0530 |
> A patch for proper search SQL string creation is attached.
Trying to apply this, I got:
address@hidden solang-sv]$ git am
~/Download/0001-Proper-handling-of-multiple-types-of-queries.patch
Applying: Proper handling of multiple types of queries
/devel/solang/git/solang-sv/.git/rebase-apply/patch:371: trailing whitespace.
*
/devel/solang/git/solang-sv/.git/rebase-apply/patch:376: trailing whitespace.
*
/devel/solang/git/solang-sv/.git/rebase-apply/patch:381: trailing whitespace.
*
/devel/solang/git/solang-sv/.git/rebase-apply/patch:433: trailing whitespace.
*
/devel/solang/git/solang-sv/.git/rebase-apply/patch:438: trailing whitespace.
*
error: patch failed: src/attribute/modification-date.cpp:21
error: src/attribute/modification-date.cpp: patch does not apply
error: patch failed: src/attribute/modification-date.h:149
error: src/attribute/modification-date.h: patch does not apply
Patch failed at 0001.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
address@hidden solang-sv]$
I took the liberty to fix those and also moved the '#include
"config.h"'s from the header to the source files. Merged and pushed.
Here is the fixed patch:
http://rishi.fedorapeople.org/0001-Proper-handling-of-multiple-types-of-queries.patch
You can always soft reset your local commit and do a 'git am
/path/to/fixed/patch'.
Happy hacking,
Rishi
--
One reason that life is complex is that it has a real part and an
imaginary part.
-- Andrew Koenig
- [Solang-devel] [PATCH] Search infrastructure, Santanu Sinha, 2009/05/21
- Re: [Solang-devel] [PATCH] Search infrastructure, Debarshi Ray, 2009/05/21
- Re: [Solang-devel] [PATCH] Search infrastructure, Debarshi Ray, 2009/05/21
- Re: [Solang-devel] [PATCH] Search infrastructure, Santanu Sinha, 2009/05/22
- Re: [Solang-devel] [PATCH] Search infrastructure, Debarshi Ray, 2009/05/22
- Message not available
- Re: [Solang-devel] [PATCH] Search infrastructure, Debarshi Ray, 2009/05/23
- Re: [Solang-devel] [PATCH] Search infrastructure, Santanu Sinha, 2009/05/23
- Re: [Solang-devel] [PATCH] Search infrastructure, Debarshi Ray, 2009/05/23
- Re: [Solang-devel] [PATCH] Search infrastructure,
Debarshi Ray <=