Enable Django admin site for Rietveld example

[techtonik, 2011-01-17 15:10:22]

Admin site works ok with Django 1.1.3

[Andi Albrecht, 2011-01-18 11:01:50]

Looks good to me, but without testing it. I cannot apply the patch for some
reason... :-(

[techtonik, 2011-01-18 21:50:23]

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.

[Andi Albrecht, 2011-01-18 21:58:40]

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



On Tue, Jan 18, 2011 at 10:50 PM,  <techtonik@gmail.com> wrote:
> 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/
>

[markroddy_gmail.com, 2011-01-19 00:23:00]

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


On Tue, Jan 18, 2011 at 4:57 PM, Andi Albrecht
<albrecht.andi@googlemail.com> wrote:
> 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
>
>
>
> On Tue, Jan 18, 2011 at 10:50 PM,  <techtonik@gmail.com> wrote:
>> 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, 2011-01-19 05:29:47]

On Wed, Jan 19, 2011 at 1:22 AM, Mark Roddy <markroddy@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.

>
> -Mark
>
>
> On Tue, Jan 18, 2011 at 4:57 PM, Andi Albrecht
> <albrecht.andi@googlemail.com> wrote:
>> 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
>>
>>
>>
>> On Tue, Jan 18, 2011 at 10:50 PM,  <techtonik@gmail.com> wrote:
>>> 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/
>>>
>>
>

[techtonik, 2011-01-19 11:29:28]

That's why I've created python-patch. =)

Thanks for reviews.