Get the file from the repository (we use p4 print //depot/path/to/file#rev
for this),  get the diff (just for that file), and then do:

patch -p0 < diff-filename

You may need to tell it the location of the file, since it may not find it.

Christian

-- 
Christian Hammond - chip...@chipx86.com
Review Board - http://www.reviewboard.org
VMware, Inc. - http://www.vmware.com


On Tue, May 15, 2012 at 11:28 PM, Nilesh Jaiswal <nileshj...@gmail.com>wrote:

> Yes this patch version 2.5.4 is running in my server.
>
> I don't know how to patch that file locally with the same patch, Could you
> help me with the step.
>
> Kind Regards,
> Nilesh
>
>
> On Wed, May 16, 2012 at 11:05 AM, Christian Hammond 
> <chip...@chipx86.com>wrote:
>
>> Hi Nilesh,
>>
>> That version seems right, but I don't know why you're hitting that
>> problem. Was that the version of patch running on the server?
>>
>> What happens if you try patching that file locally with the same patch?
>>
>>
>> Christian
>>
>> --
>> Christian Hammond - chip...@chipx86.com
>> Review Board - http://www.reviewboard.org
>> VMware, Inc. - http://www.vmware.com
>>
>>
>> On Tue, May 15, 2012 at 9:52 PM, Nilesh Jaiswal <nileshj...@gmail.com>wrote:
>>
>>> Hi Chris,
>>>
>>> Could you please provide me a solution to resolve the issue.
>>>
>>> Regards,
>>> Nilesh
>>>
>>>
>>> On Mon, May 14, 2012 at 3:40 PM, Nilesh Jaiswal <nileshj...@gmail.com>wrote:
>>>
>>>> is this patch version mentioned in the email you are talking about.? Or
>>>> something else.
>>>>
>>>> What do i need to do?
>>>>
>>>>
>>>> On Mon, May 14, 2012 at 10:48 AM, Nilesh Jaiswal 
>>>> <nileshj...@gmail.com>wrote:
>>>>
>>>>> If you are asking about the version path util then here it is.
>>>>>
>>>>> patch -version
>>>>> patch 2.5.4
>>>>> Copyright 1984-1988 Larry Wall
>>>>> Copyright 1989-1999 Free Software Foundation, Inc.
>>>>>
>>>>> Please correct me if i am wrong.
>>>>>
>>>>>
>>>>> On Mon, May 14, 2012 at 10:43 AM, Nilesh Jaiswal <nileshj...@gmail.com
>>>>> > wrote:
>>>>>
>>>>>> How to get the version of GNU patch. Are you asking about the version
>>>>>> of post-review util.?
>>>>>>
>>>>>>
>>>>>> On Mon, May 14, 2012 at 4:08 AM, Christian Hammond <
>>>>>> chip...@chipx86.com> wrote:
>>>>>>
>>>>>>> Hi Nilesh,
>>>>>>>
>>>>>>> We run everything through GNU patch. That generally will handle the
>>>>>>> "\ No newline at end of file".
>>>>>>>
>>>>>>> What version of GNU patch is running on that server? What happens if
>>>>>>> you try to apply that same patch on a developer machine?
>>>>>>>
>>>>>>> Christian
>>>>>>>
>>>>>>> --
>>>>>>> Christian Hammond - chip...@chipx86.com
>>>>>>> Review Board - http://www.reviewboard.org
>>>>>>> VMware, Inc. - http://www.vmware.com
>>>>>>>
>>>>>>>
>>>>>>> On Thu, May 10, 2012 at 12:06 AM, Nilesh Jaiswal <
>>>>>>> nileshj...@gmail.com> wrote:
>>>>>>>
>>>>>>>> Dear All,
>>>>>>>>
>>>>>>>> I have posted the queries on this but i haven't got any answer
>>>>>>>> hence i am raising this queries again.
>>>>>>>>
>>>>>>>> After posting review request and then clicking on viewdiff link on
>>>>>>>> RB server i get following error message for the files.
>>>>>>>>
>>>>>>>> The patch to
>>>>>>>> '//sdm/DEV/V14_2_App/XSDGFDH/portals/sidadfds/resources/ApplicationManager.js'
>>>>>>>> didn't apply cleanly. The temporary files have been left in
>>>>>>>> '/tmp/reviewboard.pgHnuQ' for debugging purposes. `patch` returned:
>>>>>>>> patching file /tmp/reviewboard.pgHnuQ/tmpVIuwIQ Hunk #2 FAILED at 931. 
>>>>>>>> 1
>>>>>>>> out of 2 hunks FAILED -- saving rejects to file
>>>>>>>> /tmp/reviewboard.pgHnuQ/tmpVIuwIQ-new.rej
>>>>>>>>
>>>>>>>> After looking into the /tmp/reviewboard.pgHnuQ/tmpVIuwIQ-new.rejor
>>>>>>>> diff file in /tmp of RB server its says
>>>>>>>>
>>>>>>>> Pasting diff snippet which contains the following string (*\ No
>>>>>>>> newline at end of file*) in
>>>>>>>> ActionStatusEventHandlerThread.java.diff which has caused the diff 
>>>>>>>> error.
>>>>>>>> why can we not handle such cases in viewdiff.py script. Do we have any
>>>>>>>> patch for the same. I would appreciate if you could provide me solution
>>>>>>>> that will solve 100's of such failure issues.
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>                 private void log(Exception e) {
>>>>>>>>
>>>>>>>> @@ -86,4 +93,4 @@ public class ActionStatusEventHandlerThr
>>>>>>>>
>>>>>>>>                         return "ActionStatusEventHandlerThread";
>>>>>>>>
>>>>>>>>                 }
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>> -}
>>>>>>>>
>>>>>>>> +}
>>>>>>>>
>>>>>>>> *\ No newline at end of file*
>>>>>>>>
>>>>>>>> Regards,
>>>>>>>> Nilesh J
>>>>>>>>
>>>>>>>>  --
>>>>>>>> Want to help the Review Board project? Donate today at
>>>>>>>> http://www.reviewboard.org/donate/
>>>>>>>> Happy user? Let us know at http://www.reviewboard.org/users/
>>>>>>>> -~----------~----~----~----~------~----~------~--~---
>>>>>>>> To unsubscribe from this group, send email to
>>>>>>>> reviewboard+unsubscr...@googlegroups.com
>>>>>>>> For more options, visit this group at
>>>>>>>> http://groups.google.com/group/reviewboard?hl=en
>>>>>>>
>>>>>>>
>>>>>>>  --
>>>>>>> Want to help the Review Board project? Donate today at
>>>>>>> http://www.reviewboard.org/donate/
>>>>>>> Happy user? Let us know at http://www.reviewboard.org/users/
>>>>>>> -~----------~----~----~----~------~----~------~--~---
>>>>>>> To unsubscribe from this group, send email to
>>>>>>> reviewboard+unsubscr...@googlegroups.com
>>>>>>> For more options, visit this group at
>>>>>>> http://groups.google.com/group/reviewboard?hl=en
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>
>>>  --
>>> Want to help the Review Board project? Donate today at
>>> http://www.reviewboard.org/donate/
>>> Happy user? Let us know at http://www.reviewboard.org/users/
>>> -~----------~----~----~----~------~----~------~--~---
>>> To unsubscribe from this group, send email to
>>> reviewboard+unsubscr...@googlegroups.com
>>> For more options, visit this group at
>>> http://groups.google.com/group/reviewboard?hl=en
>>>
>>
>>  --
>> Want to help the Review Board project? Donate today at
>> http://www.reviewboard.org/donate/
>> Happy user? Let us know at http://www.reviewboard.org/users/
>> -~----------~----~----~----~------~----~------~--~---
>> To unsubscribe from this group, send email to
>> reviewboard+unsubscr...@googlegroups.com
>> For more options, visit this group at
>> http://groups.google.com/group/reviewboard?hl=en
>>
>
>  --
> Want to help the Review Board project? Donate today at
> http://www.reviewboard.org/donate/
> Happy user? Let us know at http://www.reviewboard.org/users/
> -~----------~----~----~----~------~----~------~--~---
> To unsubscribe from this group, send email to
> reviewboard+unsubscr...@googlegroups.com
> For more options, visit this group at
> http://groups.google.com/group/reviewboard?hl=en
>

-- 
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~----------~----~----~----~------~----~------~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en

Reply via email to