[vlc-devel] [Patch] add json view for browse.xml

[Rémi Denis-Courmont]

Le lundi 19 septembre 2011 18:16:01 Rob, vous avez écrit :
> Doh! -resend with patch.

Not working:

Applying: refactor browse model to httprequests.lua browse.xml displays data 
from the model (in same format as before) browse.json provides alternative 
view of the same data
/home/remi/videolan/vlc/.git/rebase-apply/patch:22: trailing whitespace.
< 
/home/remi/videolan/vlc/.git/rebase-apply/patch:24: trailing whitespace.
< 
/home/remi/videolan/vlc/.git/rebase-apply/patch:29: trailing whitespace.
< 
/home/remi/videolan/vlc/.git/rebase-apply/patch:34: trailing whitespace.
< 
error: patch failed: share/lua/http/requests/browse.xml:25
error: share/lua/http/requests/browse.xml: patch does not apply
error: patch failed: share/lua/intf/modules/httprequests.lua:354
error: share/lua/intf/modules/httprequests.lua: patch does not apply
Patch failed at 0001 refactor browse model to httprequests.lua browse.xml 
displays data from the model (in same format as before) browse.json provides 
alternative view of the same data
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

And please keep respect the comment length convention. It should be pretty 
obvious if you use a decent text editor like vim.

-- 
Rémi Denis-Courmont
http://www.remlab.net/
http://fi.linkedin.com/in/remidenis