WebKit open source development ()

Ryosuke Niwa | 6 Aug 2012 07:12

Re: How to download the patch and apply it to git

If you can't run webkit-patch, then you can do:

patch -p0 <path to locally saved patch>

On Sun, Aug 5, 2012 at 10:08 PM, 石梦军 <talking1239 <at> 126.com> wrote:

But in the windows platform, how to execute the webkit-patch.

Thanks.

--

BGs/Felix Shi

At 2012-08-06 12:59:54,"Ryosuke Niwa" <rniwa <at> webkit.org> wrote:
webkit-patch apply-from-bug <bug number> or webkit-patch apply-attachment <attachment id> wi ll do.

On Sun, Aug 5, 2012 at 9:57 PM, <talking1239 <at> gmail.com> wrote:

Hi

I want to apply an patch to my git code, but i don't know how to download and apply it.

Any help explaining this would be much appreciated!

this is one of patch https://bugs.webkit.org/attachment.cgi

--

BGs/Felix Shi

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

headers

talking1239 | 6 Aug 2012 07:15

Re: How to download the patch and apply it to git

But for the patch file, how can i download it. like download patch file from this url 'https://bugs.webkit.org/attachment.cgi?id=76514&action=edit"

BGs/Felix Shi

At 2012-08-06 13:12:01,"Ryosuke Niwa" <rniwa <at> webkit.org> wrote:

If you can't run webkit-patch, then you can do:
patch -p0 <path to locally saved patch>

On Sun, Aug 5, 2012 at 10:08 PM, 石梦军 <talking1239 <at> 126.com> wrote:

But in the windows platform, how to execute the webkit-patch.

Thanks.

--

BGs/Felix Shi

At 2012-08-06 12:59:54,"Ryosuke Niwa" <rniwa <at> webkit.org> wrote:
webkit-patch apply-from-bug <bug number> or webkit-patch apply-attachment <attachment id> wi ll do.

On Sun, Aug 5, 2012 at 9:57 PM, <talking1239 <at> gmail.com> wrote:

Hi

I want to apply an patch to my git code, but i don't know how to download and apply it.

Any help explaining this would be much appreciated!

this is one of patch https://bugs.webkit.org/attachment.cgi

--

BGs/Felix Shi

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

headers

Ryosuke Niwa | 6 Aug 2012 07:19

Re: How to download the patch and apply it to git

https://bug-44329-attachments.webkit.org/attachment.cgi?id=76514

On Sun, Aug 5, 2012 at 10:15 PM, <talking1239 <at> gmail.com> wrote:

But for the patch file, how can i download it. like download patch file from this url 'https://bugs.webkit.org/attachment.cgi?id=76514&action=edit"
--

BGs/Felix Shi

At 2012-08-06 13:12:01,"Ryosuke Niwa" <rniwa <at> webkit.org> wrote:
If you can't run webkit-patch, then you can do:
patch -p0 <path to locally saved patch>

On Sun, Aug 5, 2012 at 10:08 PM, 石梦军 <talking1239 <at> 126.com> wrote:

But in the windows platform, how to execute the webkit-patch.

Thanks.

--

BGs/Felix Shi

At 2012-08-06 12:59:54,"Ryosuke Niwa" <rniwa <at> webkit.org> wrote:
webkit-patch apply-from-bug <bug number> or webkit-patch apply-attachment <attachment id> wi ll do.

On Sun, Aug 5, 2012 at 9:57 PM, <talking1239 <at> gmail.com> wrote:

Hi

I want to apply an patch to my git code, but i don't know how to download and apply it.

Any help explaining this would be much appreciated!

this is one of patch https://bugs.webkit.org/attachment.cgi

--

BGs/Felix Shi

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

headers

talking1239 | 6 Aug 2012 07:25

Re: How to download the patch and apply it to git

I use follow command "patch -p0 D:\work\bsquare-code\jit.patch" in the git -bash, but it no response.

BGs/Felix Shi

At 2012-08-06 13:19:26,"Ryosuke Niwa" <rniwa <at> webkit.org> wrote:

https://bug-44329-attachments.webkit.org/attachment.cgi?id=76514

On Sun, Aug 5, 2012 at 10:15 PM, <talking1239 <at> gmail.com> wrote:

But for the patch file, how can i download it. like download patch file from this url 'https://bugs.webkit.org/attachment.cgi?id=76514&action=edit"
--

BGs/Felix Shi

At 2012-08-06 13:12:01,"Ryosuke Niwa" <rniwa <at> webkit.org> wrote:
If you can't run webkit-patch, then you can do:
patch -p0 <path to locally saved patch>

On Sun, Aug 5, 2012 at 10:08 PM, 石梦军 <talking1239 <at> 126.com> wrote:

But in the windows platform, how to execute the webkit-patch.

Thanks.

--

BGs/Felix Shi

At 2012-08-06 12:59:54,"Ryosuke Niwa" <rniwa <at> webkit.org> wrote:
webkit-patch apply-from-bug <bug number> or webkit-patch apply-attachment <attachment id> wi ll do.

On Sun, Aug 5, 2012 at 9:57 PM, <talking1239 <at> gmail.com> wrote:

Hi

I want to apply an patch to my git code, but i don't know how to download and apply it.

Any help explaining this would be much appreciated!

this is one of patch https://bugs.webkit.org/attachment.cgi

--

BGs/Felix Shi

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

headers

Andy Estes | 6 Aug 2012 07:41

Re: How to download the patch and apply it to git

On Aug 5, 2012, at 10:25 PM, talking1239 <at> gmail.com wrote:

I use follow command "patch -p0 D:\work\bsquare-code\jit.patch" in the git -bash, but it no response.

patch reads from standard input. Your command should look like:

patch -p0 < path-to-file

-Andy

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

headers

Andy Estes | 6 Aug 2012 07:49

Re: How to download the patch and apply it to git

On Aug 5, 2012, at 10:25 PM, talking1239 <at> gmail.com wrote:

I use follow command "patch -p0 D:\work\bsquare-code\jit.patch" in the git -bash, but it no response.

Also, you probably want -p1 instead of -p0. I'm sure someone would be happy to help you with this on #webkit if you're still having issues.

-Andy

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

headers

talking1239 | 6 Aug 2012 07:57

Re: How to download the patch and apply it to git

I use patch -p1 < "patch file" and it show me as follow inforamtion, so if I need to manual modify the patch file?

$ patch -p1 < "D:\study\jit.patch"

patching file `ChangeLog'

Hunk #1 FAILED at 1.

1 out of 1 hunk FAILED -- saving rejects to ChangeLog.rej

patching file `configure.ac'

Hunk #1 succeeded at 633 (offset -87 lines).

patch unexpectedly ends in middle of line

Hunk #2 succeeded at 779 with fuzz 1 (offset -27 lines).

BGs/Felix Shi div>

At 2012-08-06 13:49:50,"Andy Estes" <aestes <at> apple.com> wrote:

On Aug 5, 2012, at 10:25 PM, talking1239 <at> gmail.com wrote:

I use follow command "patch -p0 D:\work\bsquare-code\jit.patch" in the git -bash, but it no response.

Also, you probably want -p1 instead of -p0. I'm sure someone would be happy to help you with this on #webkit if you're still having issues.

-Andy

Attachment (jit.patch): application/octet-stream, 1975 bytes

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

headers

Andy Estes | 6 Aug 2012 08:04

Re: How to download the patch and apply it to git

It looks like everything but the ChangeLog was patched cleanly, so you should be fine. You can do a sanity check by typing 'git diff' and comparing the output to the original patch.

-Andy

On Aug 5, 2012, at 10:57 PM, talking1239 <at> gmail.com wrote:

I use patch -p1 < "patch file" and it show me as follow inforamtion, so if I need to manual modify the patch file?

$ patch -p1 < "D:\study\jit.patch"

patching file `ChangeLog'

Hunk #1 FAILED at 1.

1 out of 1 hunk FAILED -- saving rejects to ChangeLog.rej

patching file `configure.ac'

Hunk #1 succeeded at 633 (offset -87 lines).

patch unexpectedly ends in middle of line

Hunk #2 succeeded at 779 with fuzz 1 (offset -27 lines).

--

BGs/Felix Shi
<jit.patch>

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev

headers

talking1239 | 6 Aug 2012 08:16

Re: How to download the patch and apply it to git

Thanks.

I want to know if exist an way to convert the git patch format to svn patch format?

BGs/Felix Shi

At 2012-08-06 14:04:28,"Andy Estes" <aestes <at> apple.com> wrote:

It looks like everything but the ChangeLog was patched cleanly, so you should be fine. You can do a sanity check by typing 'git diff' and comparing the output to the original patch.

-Andy

On Aug 5, 2012, at 10:57 PM, talking1239 <at> gmail.com wrote:

I use patch -p1 < "patch file" and it show me as follow inforamtion, so if I need to manual modify the patch file?

$ patch -p1 < "D:\study\jit.patch"

patching file `ChangeLog'

Hunk #1 FAILED at 1.

1 out of 1 hunk FAILED -- saving rejects to ChangeLog.rej

patching file `configure.ac'

Hunk #1 succeeded at 633 (offset -87 lines).

patch unexpectedly ends in middle of line

Hunk #2 succeeded at 779 with fu zz 1 (offset -27 lines).

--

BGs/Felix Shi
<jit.patch>

_______________________________________________
webkit-dev mailing list
webkit-dev <at> lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev