From: Marcel Holtmann <marcel@holtmann.org>
To: ofono@ofono.org
Subject: Re: [PATCH] test: add disable-call-forwarding
Date: Wed, 12 Jan 2011 08:18:01 -0800 [thread overview]
Message-ID: <1294849081.3873.85.camel@aeonflux> (raw)
In-Reply-To: <1294825320-2928-1-git-send-email-jarko.poutiainen@tieto.com>
[-- Attachment #1: Type: text/plain, Size: 1002 bytes --]
Hi Jarko,
> Makefile.am | 3 +-
> test/disable-call-forwarding | 53 ++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 55 insertions(+), 1 deletions(-)
> create mode 100755 test/disable-call-forwarding
Applying: test: add disable-call-forwarding
error: patch failed: Makefile.am:449
error: Makefile.am: patch does not apply
Patch failed at 0001 test: add disable-call-forwarding
> diff --git a/Makefile.am b/Makefile.am
> index 4dec90a..2df0fbd 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -449,7 +449,8 @@ test_scripts = test/backtrace \
> test/set-tty \
> test/set-gsm-band \
> test/set-umts-band \
> - test/lockdown-modem
> + test/lockdown-modem \
> + test/disable-call-forwarding
The error message is not surprising actually. You need to send patches
that depend on each other to applied one before the other one as
sequence of patches. This one is conflicting with your previous one ;)
Regards
Marcel
next prev parent reply other threads:[~2011-01-12 16:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-12 9:42 [PATCH] test: add disable-call-forwarding Jarko Poutiainen
2011-01-12 16:18 ` Marcel Holtmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-01-14 8:24 Jarko Poutiainen
2011-01-14 10:31 ` Marcel Holtmann
2011-01-10 12:06 Jarko Poutiainen
2011-01-11 15:08 ` Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1294849081.3873.85.camel@aeonflux \
--to=marcel@holtmann.org \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox