[llvm-commits] [PATCH] Convert SourceLevelDebugging.html to reST

Dmitri Gribenko gribozavr at gmail.com
Wed Nov 21 11:36:34 PST 2012


On Wed, Nov 21, 2012 at 9:24 PM, Eli Bendersky <eliben at google.com> wrote:
> Applying this:
>
> $ patch -p0 < convert-SourceLevelDebugging-to-rst-v1.patch
> patching file docs/SourceLevelDebugging.rst
> patching file docs/SourceLevelDebugging.html
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n] y
> Hunk #1 FAILED at 1.
> File docs/SourceLevelDebugging.html is not empty after patch, as expected
> 1 out of 1 hunk FAILED -- saving rejects to file
> docs/SourceLevelDebugging.html.rej
>
> Am I applying the patch incorrectly?

Hmm, it is weird.  I reproduced this on a clean checkout, but I can
not see what is wrong with patch creation -- I created the patch with
'svn diff .'

But 'svn patch /path/to/patch' works.  Seems like svn messed up file
deletion in the patch... Please remove docs/SourceLevelDebugging.html
manually.  This should be correct in real commit.

> Then, when I run in docs:
>
> $ make -f Makefile.sphinx
>
> I get this warning
>
> ... docs/SourceLevelDebugging.rst:: WARNING: document isn't included
> in any toctree

Thanks, fixed.  See attached patch.

Dmitri

-- 
main(i,j){for(i=2;;i++){for(j=2;j<i;j++){if(!(i%j)){j=0;break;}}if
(j){printf("%d\n",i);}}} /*Dmitri Gribenko <gribozavr at gmail.com>*/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: convert-SourceLevelDebugging-to-rst-v2.patch
Type: application/octet-stream
Size: 188381 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20121121/d66f9158/attachment.obj>


More information about the llvm-commits mailing list