On 12/12/2011 04:49 AM, Baurzhan Ismagulov wrote: > On Fri, Dec 09, 2011 at 08:26:38AM -0800, John Reiser wrote: >>>> The patch is: https://bugs.kde.org/show_bug.cgi?id=276897#c2 > ... >> Did you look at Comment #3, immediately following (and about 1 hour after) >> Comment #2? >> Did you look at Comment #6, about one week after Comment #2, and now two >> months ago?
> #3 applied cleanly on r11823, #6 doesn't. Do you remember which revision > it applies on, or do you have an updated version? In the output from any "svn diff" the header for each file indicates which version: Index: coregrind/m_dispatch/dispatch-arm-linux.S =================================================================== --- coregrind/m_dispatch/dispatch-arm-linux.S (revision 12107) +++ coregrind/m_dispatch/dispatch-arm-linux.S (working copy) so that one was revision 12107, as are all of them from Comment #6. The header is listed for each file for completeness and so that outputs from multiple "svn diff" can be concatenated yet still be decoded easily. Apparently you are on revision 11823, more than 260 revisions before 12084 of Comment #2. Why so old? (Today's revision number after "svn update" was 12293.) In any case, it is your responsibility to adjust. In many cases 'patch' automatically adjusts the positions or uses "fuzz" successfully. In a few instances manual editing may be necessary, but the "*.rej" files provide clues. Tweaking with 'diff3' might provide automated assistance. Your posts give strong hints of lack of experience, for instance "patch -p0". Please search and learn from a tutorial. One common beginner error is not reversing the patch from Comment #2 before trying to apply the newer version from Comment #6. Another common beginner error is not posting an actual error message from 'patch' when complaining "the patch does not apply cleanly." In particular, some configuration files are more suitable for manual attention while lowest-level bare-metal source code "always" should be handled automatically. -- ------------------------------------------------------------------------------ Learn Windows Azure Live! Tuesday, Dec 13, 2011 Microsoft is holding a special Learn Windows Azure training event for developers. It will provide a great way to learn Windows Azure and what it provides. You can attend the event by watching it streamed LIVE online. Learn more at http://p.sf.net/sfu/ms-windowsazure _______________________________________________ Valgrind-users mailing list Valgrind-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/valgrind-users
