Re: applying a patch

[paulh]

Thanks to everybody who replied, in the end I downloaded git, cloned
the django repository with with git clone and applied the patch with
git apply and it all worked well.

Paul Hide

On 26 Nov, 12:26, Tim Chase  wrote:
> rebus_ wrote:
> >> diff --git a/django/contrib/admin/media/js/admin/
> >> RelatedObjectLookups.js b/django/contrib/admin/media/js/admin/
> >> RelatedObjectLookups.js
> >> index 1bc78f8..3941752 100644
> >> --- a/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
> >> +++ b/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
>
> >> so I guess that explains it, but I thought django used used svn!
>
> > Django uses SVN as the official repository, but AFAIK git is often
> > used for development of new features etc cos it is not centralized and
> > it is very simple to create branches in it and so on.
>
> > For patching on windows you could use either gnuwin32 [1] or unxutils
> > [2] for comand line, both of which should be able to usepatchfiles
> > produced by any diff (svn, git or just diff) like Tim said:
>
> >patch-p0 < /path/to/patch.diff
>
> TortoiseSVN has an option for "ApplyPatch" that should behave
> similarly.
>
> -tim

--

You received this message because you are subscribed to the Google Groups 
"Django users" group.
To post to this group, send email to django-us...@googlegroups.com.
To unsubscribe from this group, send email to 
django-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-users?hl=en.

Re: applying a patch

[Tim Chase]

rebus_ wrote:
>> diff --git a/django/contrib/admin/media/js/admin/
>> RelatedObjectLookups.js b/django/contrib/admin/media/js/admin/
>> RelatedObjectLookups.js
>> index 1bc78f8..3941752 100644
>> --- a/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
>> +++ b/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
>>
>> so I guess that explains it, but I thought django used used svn!
> 
> Django uses SVN as the official repository, but AFAIK git is often
> used for development of new features etc cos it is not centralized and
> it is very simple to create branches in it and so on.
> 
> For patching on windows you could use either gnuwin32 [1] or unxutils
> [2] for comand line, both of which should be able to use patch files
> produced by any diff (svn, git or just diff) like Tim said:
> 
> patch -p0 < /path/to/patch.diff


TortoiseSVN has an option for "Apply Patch" that should behave 
similarly.

-tim


--

You received this message because you are subscribed to the Google Groups 
"Django users" group.
To post to this group, send email to django-us...@googlegroups.com.
To unsubscribe from this group, send email to 
django-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-users?hl=en.

Re: applying a patch

[rebus_]

2009/11/26 paulh :
> Thank's for the reply. I do use tortoise and I tried what you
> suggested: nothing happened. Now I look at the patch file I think
> maybe it was generated by git (which I am not familiar with). The
> first few lines of the patch file (downloaded from django source) are:
>
> diff --git a/django/contrib/admin/media/js/admin/
> RelatedObjectLookups.js b/django/contrib/admin/media/js/admin/
> RelatedObjectLookups.js
> index 1bc78f8..3941752 100644
> --- a/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
> +++ b/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
>
> so I guess that explains it, but I thought django used used svn!
>
> Paul Hide
>

Django uses SVN as the official repository, but AFAIK git is often
used for development of new features etc cos it is not centralized and
it is very simple to create branches in it and so on.

For patching on windows you could use either gnuwin32 [1] or unxutils
[2] for comand line, both of which should be able to use patch files
produced by any diff (svn, git or just diff) like Tim said:

patch -p0 < /path/to/patch.diff

If your are fan of GUI apps then there are TortoiseSVN or  Eclipse but
i am not too sure how to apply patches with them, though a quick
google search would answer that question probably.

[1] http://gnuwin32.sourceforge.net/packages/patch.htm
[2] http://sourceforge.net/projects/unxutils/

Davor

--

You received this message because you are subscribed to the Google Groups 
"Django users" group.
To post to this group, send email to django-us...@googlegroups.com.
To unsubscribe from this group, send email to 
django-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-users?hl=en.

Re: applying a patch

[paulh]

Thank's for the reply. I do use tortoise and I tried what you
suggested: nothing happened. Now I look at the patch file I think
maybe it was generated by git (which I am not familiar with). The
first few lines of the patch file (downloaded from django source) are:

diff --git a/django/contrib/admin/media/js/admin/
RelatedObjectLookups.js b/django/contrib/admin/media/js/admin/
RelatedObjectLookups.js
index 1bc78f8..3941752 100644
--- a/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
+++ b/django/contrib/admin/media/js/admin/RelatedObjectLookups.js

so I guess that explains it, but I thought django used used svn!

Paul Hide



On Nov 25, 7:43 pm, Tim Valenta <tonightslasts...@gmail.com> wrote:
> It's meant to be done through an SVN checkout, since that's the format
> that the Django development repository is kept.
>
> If you haven't got SVN, I'd start there.  If you're on Windows, the
> "nicest" solution is "tortoisesvn", which integrates pretty simply
> into the Windows shell for easy right-click controls.  If you've got
> some form of Unix, then you'll have to decide if you've already got
> the commandline client program.
>
> If you've got SVN under your belt, then you're pretty much already
> almost there.  If you're using the command line, you'll have to
> navigate to your repository, and then use:
>
>     patch -p0 < /path/to/patch.diff
>
> If you're using that Windows "TortoiseSVN", you can right-click the
> repository folder, and use the menus to find the "Apply patch"
> command.  Just locate it and it should be done.
>
> There are some complications with command line patching where file
> renames are involved.  Hopefully your patch is pretty simple.  There's
> quite a bit of info in the blog circles about this stuff, so you can
> find more specifics by searching online.
>
> Tim
>
> On Nov 25, 12:12 pm, paulh <paul.h...@gmail.com> wrote:
>
> > I am interested in applying patch 7028, but I don't know what to apply
> > it to.
> > Any help would be appreciated.
>
> > Paul Hide

--

You received this message because you are subscribed to the Google Groups 
"Django users" group.
To post to this group, send email to django-us...@googlegroups.com.
To unsubscribe from this group, send email to 
django-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-users?hl=en.

Re: applying a patch

[Tim Valenta]

It's meant to be done through an SVN checkout, since that's the format
that the Django development repository is kept.

If you haven't got SVN, I'd start there.  If you're on Windows, the
"nicest" solution is "tortoisesvn", which integrates pretty simply
into the Windows shell for easy right-click controls.  If you've got
some form of Unix, then you'll have to decide if you've already got
the commandline client program.

If you've got SVN under your belt, then you're pretty much already
almost there.  If you're using the command line, you'll have to
navigate to your repository, and then use:

patch -p0 < /path/to/patch.diff

If you're using that Windows "TortoiseSVN", you can right-click the
repository folder, and use the menus to find the "Apply patch"
command.  Just locate it and it should be done.

There are some complications with command line patching where file
renames are involved.  Hopefully your patch is pretty simple.  There's
quite a bit of info in the blog circles about this stuff, so you can
find more specifics by searching online.

Tim

On Nov 25, 12:12 pm, paulh <paul.h...@gmail.com> wrote:
> I am interested in applying patch 7028, but I don't know what to apply
> it to.
> Any help would be appreciated.
>
> Paul Hide

--

You received this message because you are subscribed to the Google Groups 
"Django users" group.
To post to this group, send email to django-us...@googlegroups.com.
To unsubscribe from this group, send email to 
django-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-users?hl=en.

applying a patch

[paulh]

I am interested in applying patch 7028, but I don't know what to apply
it to.
Any help would be appreciated.

Paul Hide

--

You received this message because you are subscribed to the Google Groups 
"Django users" group.
To post to this group, send email to django-us...@googlegroups.com.
To unsubscribe from this group, send email to 
django-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-users?hl=en.

Re: applying a patch in windows ???

[MacH G]

hey thank u guys this time just did manual replacement and it works fine

On 3/6/07, limodou <[EMAIL PROTECTED]> wrote:
>
>
> On 3/6/07, MacH G <[EMAIL PROTECTED]> wrote:
> > hi all ,
> > for the list_filter to add fields other than specified fields i got a
> patch
> > file (list_filter.3.diff ) from the following url
> > http://code.djangoproject.com/ticket/3400  but i do know
> > how to apply it in windows could somebody tell me the command to apply
> it .
> >
> > thanks in advance
> >
> Try tortoiseSVN tool.
>
> --
> I like python!
> UliPad <>: http://wiki.woodpecker.org.cn/moin/UliPad
> My Blog: http://www.donews.net/limodou
>
> >
>


-- 
ashok
improving in dJango

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django users" group.
To post to this group, send email to django-users@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-users?hl=en
-~--~~~~--~~--~--~---

Re: applying a patch in windows ???

[limodou]

On 3/6/07, MacH G <[EMAIL PROTECTED]> wrote:
> hi all ,
> for the list_filter to add fields other than specified fields i got a patch
> file (list_filter.3.diff ) from the following url
> http://code.djangoproject.com/ticket/3400  but i do know
> how to apply it in windows could somebody tell me the command to apply it .
>
> thanks in advance
>
Try tortoiseSVN tool.

-- 
I like python!
UliPad <>: http://wiki.woodpecker.org.cn/moin/UliPad
My Blog: http://www.donews.net/limodou

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django users" group.
To post to this group, send email to django-users@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-users?hl=en
-~--~~~~--~~--~--~---

Re: applying a patch in windows ???

[Martin Winkler]

Am Tue, 6 Mar 2007 17:37:21 +0530
schrieb "MacH G" <[EMAIL PROTECTED]>:

> i do [not] know how to apply
> it in windows could somebody tell me the command to apply it .

If you are comfortable with the unix command line, install cygwin
(http://www.cygwin.com/). You'll get a full unix shell environment
including the gnu diff tool.

Otherwise you might have a look at the various diff/merge tools
available for Windows.
For example:
http://www.thefreecountry.com/programming/filecomparison.shtml
or use your favourite search engine with the keywords "windows diff
tool"

As a last resort, edit the files manually as seen on
http://code.djangoproject.com/attachment/ticket/3400/list_filter.3.diff
Remove red lines, insert green lines.

hope that helps,

Martin

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django users" group.
To post to this group, send email to django-users@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-users?hl=en
-~--~~~~--~~--~--~---

applying a patch in windows ???

[MacH G]

hi all ,
for the list_filter to add fields other than specified fields i got a patch
file (*list_filter.3.diff* ) from the following url
http://code.djangoproject.com/ticket/3400 but i do know how to apply it in
windows could somebody tell me the command to apply it .

thanks in advance

ashok

-- 
ashok

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django users" group.
To post to this group, send email to django-users@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-users?hl=en
-~--~~~~--~~--~--~---

applying oracle patch

[Zed Lopez]

Hi folks,

I'm having difficulty applying the patch at:

http://code.djangoproject.com/attachment/ticket/87/oracle_patch_as_of_rev_2074.patch

I got Django rev. 2074 from subversion, applied the above patch, and
downloaded oracle.py from:

http://code.djangoproject.com/attachment/ticket/87/oracle.py

I started a new Django project, and edited its settings.py to use
Oracle. On trying to start the server, I got:

Validating models...
Unhandled exception in thread started by 
Traceback (most recent call last):
  File "/apps/home/cns/zed/lib/python/django/core/management.py", line
796, in inner_run
validate()
  File "/apps/home/cns/zed/lib/python/django/core/management.py", line
780, in validate
num_errors = get_validation_errors(outfile)
  File "/apps/home/cns/zed/lib/python/django/core/management.py", line
671, in get_validation_errors
import django.models
  File "/apps/home/cns/zed/lib/python/django/models/__init__.py", line
1, in ?
from django.core import meta
  File "/apps/home/cns/zed/lib/python/django/core/meta/__init__.py",
line 3, in ?
from django.core import db
  File "/apps/home/cns/zed/lib/python/django/core/db/__init__.py", line
35, in ?
get_limit_offset_sql = dbmod.get_limit_offset_sql
AttributeError: 'module' object has no attribute 'get_limit_offset_sql'

Looking at all the files attached to that ticket, it looks like
oracle.py was updated in:

http://code.djangoproject.com/attachment/ticket/87/unified_diff_oracle_backend_rev_656.txt

but that that didn't make it into oracle.py or the 2074 patch. Using
the oracle.py from the rev. 656 patch (leaving all other files as they
were after patching 2074), on running the server I get:

Validating models...
Unhandled exception in thread started by 
Traceback (most recent call last):
  File "/apps/home/cns/zed/lib/python/django/core/management.py", line
796, in inner_run
validate()
  File "/apps/home/cns/zed/lib/python/django/core/management.py", line
780, in validate
num_errors = get_validation_errors(outfile)
  File "/apps/home/cns/zed/lib/python/django/core/management.py", line
671, in get_validation_errors
import django.models
  File "/apps/home/cns/zed/lib/python/django/models/__init__.py", line
1, in ?
from django.core import meta
  File "/apps/home/cns/zed/lib/python/django/core/meta/__init__.py",
line 3, in ?
from django.core import db
  File "/apps/home/cns/zed/lib/python/django/core/db/__init__.py", line
38, in ?
get_table_description = dbmod.get_table_description
AttributeError: 'module' object has no attribute
'get_table_description'

None of the ticket 87 files seem to have anything about
'get_table_description.'

So how is one supposed to install the Oracle patch?

thanks,

Zed


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django users" group.
To post to this group, send email to django-users@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-users
-~--~~~~--~~--~--~---