How to download the patch and apply it to git

classic Classic list List threaded Threaded
12 messages Options
Reply | Threaded
Open this post in threaded view
|

How to download the patch and apply it to git

felixs
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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev
Reply | Threaded
Open this post in threaded view
|

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

Ryosuke Niwa-2
webkit-patch apply-from-bug <bug number> or webkit-patch apply-attachment <attachment id> will do.


On Sun, Aug 5, 2012 at 9:57 PM, <[hidden email]> 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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev



_______________________________________________
webkit-dev mailing list
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev
Reply | Threaded
Open this post in threaded view
|

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

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

--
BGs/Felix Shi

At 2012-08-06 12:59:54,"Ryosuke Niwa" <[hidden email]> wrote:
webkit-patch apply-from-bug <bug number> or webkit-patch apply-attachment <attachment id> will do.


On Sun, Aug 5, 2012 at 9:57 PM, <[hidden email]> 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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev





_______________________________________________
webkit-dev mailing list
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev
Reply | Threaded
Open this post in threaded view
|

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

Ryosuke Niwa-2
In reply to this post by Ryosuke Niwa-2
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, 石梦军 <[hidden email]> 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" <[hidden email]> 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, <[hidden email]> 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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev






_______________________________________________
webkit-dev mailing list
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev
Reply | Threaded
Open this post in threaded view
|

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

felixs
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" <[hidden email]> 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, 石梦军 <[hidden email]> 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" <[hidden email]> 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, <[hidden email]> 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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev








_______________________________________________
webkit-dev mailing list
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev
Reply | Threaded
Open this post in threaded view
|

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

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

On Sun, Aug 5, 2012 at 10:15 PM, <[hidden email]> 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" <[hidden email]> 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, 石梦军 <[hidden email]> 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" <[hidden email]> 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, <[hidden email]> 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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev









_______________________________________________
webkit-dev mailing list
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev
Reply | Threaded
Open this post in threaded view
|

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

felixs
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" <[hidden email]> wrote:
https://bug-44329-attachments.webkit.org/attachment.cgi?id=76514

On Sun, Aug 5, 2012 at 10:15 PM, <[hidden email]> 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" <[hidden email]> 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, 石梦军 <[hidden email]> 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" <[hidden email]> 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, <[hidden email]> 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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev











_______________________________________________
webkit-dev mailing list
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev
Reply | Threaded
Open this post in threaded view
|

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

Andy Estes

On Aug 5, 2012, at 10:25 PM, [hidden email] 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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev
Reply | Threaded
Open this post in threaded view
|

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

Andy Estes
In reply to this post by felixs

On Aug 5, 2012, at 10:25 PM, [hidden email] 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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev
Reply | Threaded
Open this post in threaded view
|

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

felixs
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

At 2012-08-06 13:49:50,"Andy Estes" <[hidden email]> wrote:

On Aug 5, 2012, at 10:25 PM, [hidden email] 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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev

jit.patch (2K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

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

Andy Estes
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, [hidden email] 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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev
Reply | Threaded
Open this post in threaded view
|

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

felixs
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" <[hidden email]> 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, [hidden email] 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
[hidden email]
http://lists.webkit.org/mailman/listinfo/webkit-dev