On Tue, 4 Jan 2011 09:53:11 +0100
Francesco <francesco.colista@gmail.com> wrote:
> Now, rp-pppoe uses runscript instead of /bin/sh> > Plase review and commit.
error: testing/rp-pppoe/APKBUILD: already exists in index
error: testing/rp-pppoe/rp-pppoe.initd: already exists in index
Patch failed at 0001 rp-pppoe init now use runscript
Can you please rebase it against current git master and resend it?
Something like:
git checkout master
git pull --rebase
cd testing/rp-pppoe
# edit files
git add .
git commit # use 'testing/rp-pppoe: use runscript' as first line in
commit message.
Then:
git send-email --to alpine-devel@lists.alpinelinux.org HEAD^
Thanks!
-nc
---
Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org
Help: alpine-devel+help@lists.alpinelinux.org
---
Ok, this should work.
Thanks!
:: Francesco Colista
:: Email : francesco.colista@gmail.com
:: Jabber: francesco@jabber.org
2011/1/4 Natanael Copa <ncopa@alpinelinux.org>:
> On Tue, 4 Jan 2011 09:53:11 +0100> Francesco <francesco.colista@gmail.com> wrote:>>> Now, rp-pppoe uses runscript instead of /bin/sh>>>> Plase review and commit.>> error: testing/rp-pppoe/APKBUILD: already exists in index> error: testing/rp-pppoe/rp-pppoe.initd: already exists in index> Patch failed at 0001 rp-pppoe init now use runscript>> Can you please rebase it against current git master and resend it?>> Something like:>> git checkout master> git pull --rebase> cd testing/rp-pppoe> # edit files> git add .> git commit # use 'testing/rp-pppoe: use runscript' as first line in> commit message.>> Then:> git send-email --to alpine-devel@lists.alpinelinux.org HEAD^>> Thanks!> -nc>