[pacman-dev] [PATCH 4/4] Fixed some inconsistencies and errors in the pactest documentation.

Dan McGee dpmcgee at gmail.com
Fri Jan 16 21:24:23 EST 2009


On Fri, Jan 16, 2009 at 8:14 PM, Bryan Ischo
<bji-keyword-pacman.3644cb at www.ischo.com> wrote:
> Signed-off-by: Bryan Ischo <bryan at ischo.com>
> ---
>  pactest/README |   25 ++++++++++++++++---------
>  1 files changed, 16 insertions(+), 9 deletions(-)

I'd much prefer you try git-send-email from here on out. I can't keep
having to do this:

$ git am -3 -s < /tmp/pactest-readme-updates.patch
Applying: Fixed some inconsistencies and errors in the pactest documentation.
error: patch failed: pactest/README:70
error: pactest/README: patch does not apply
Using index info to reconstruct a base tree...
error: patch failed: pactest/README:70
error: pactest/README: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001.
When you have resolved this problem run "git am -3 --resolved".
If you would prefer to skip this patch, instead run "git am -3 --skip".
To restore the original branch and stop patching run "git am -3 --abort".

I got this one applied after a struggle, but it looks like something
in your email chain is munging whitespace and other fun things.

-Dan


More information about the pacman-dev mailing list