Re: Enable Django admin site for Rietveld example (issue3982041)

3 views
Skip to first unread message

albrec...@googlemail.com

unread,
Jan 18, 2011, 6:01:50 AM1/18/11
to tech...@gmail.com, gae2d...@googlegroups.com, re...@codereview.appspotmail.com
Looks good to me, but without testing it. I cannot apply the patch for
some reason... :-(

http://codereview.appspot.com/3982041/

tech...@gmail.com

unread,
Jan 18, 2011, 4:50:23 PM1/18/11
to albrec...@googlemail.com, gae2d...@googlegroups.com, re...@codereview.appspotmail.com
What tool do you use for patching? My python-patch complains only about
"\ No newline at end of file" string at the end, but it's normal,
because not supported.

http://codereview.appspot.com/3982041/

Andi Albrecht

unread,
Jan 18, 2011, 4:57:04 PM1/18/11
to tech...@gmail.com, albrec...@googlemail.com, gae2d...@googlegroups.com, re...@codereview.appspotmail.com
I've just downloaded the patch and tried to apply it.
Here's the output. Working directory is the root directory in trunk:

$ svn info|grep Revisionon
Revision: 155

$ curl http://codereview.appspot.com/download/issue3982041_1.diff | patch
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 1546 0 1546 0 0 4486 0 --:--:-- --:--:-- --:--:-- 5725
patching file urls.py
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 10.
2 out of 2 hunks FAILED -- saving rejects to file urls.py.rej
patching file settings.py
Hunk #1 FAILED at 71.
1 out of 1 hunk FAILED -- saving rejects to file settings.py.rej
patching file TODO
Reversed (or previously applied) patch detected! Assume -R? [n] n
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file TODO.rej

Mark Roddy

unread,
Jan 18, 2011, 7:22:59 PM1/18/11
to gae2d...@googlegroups.com, tech...@gmail.com, albrec...@googlemail.com, re...@codereview.appspotmail.com
If it's a subversion generated diff you need to specify '-p0' to the
patch command. Try this:
curl http://codereview.appspot.com/download/issue3982041_1.diff | patch -p0

-Mark

Andi Albrecht

unread,
Jan 19, 2011, 12:29:45 AM1/19/11
to Mark Roddy, gae2d...@googlegroups.com, tech...@gmail.com, re...@codereview.appspotmail.com
On Wed, Jan 19, 2011 at 1:22 AM, Mark Roddy <mark...@gmail.com> wrote:
> If it's a subversion generated diff you need to specify '-p0' to the
> patch command.  Try this:
> curl http://codereview.appspot.com/download/issue3982041_1.diff | patch -p0

hehe, sure, thanks :)

committed r156.

tech...@gmail.com

unread,
Jan 19, 2011, 6:29:28 AM1/19/11
to albrec...@googlemail.com, mark...@gmail.com, gae2d...@googlegroups.com, re...@codereview.appspotmail.com
That's why I've created python-patch. =)

Thanks for reviews.

http://codereview.appspot.com/3982041/

Reply all
Reply to author
Forward
0 new messages