Skip to content

Commit 1d928f6

Browse files
committed
Hopefully fixing the patch application
- Legacy-Id: 196
1 parent 0ecb3e5 commit 1d928f6

2 files changed

Lines changed: 3 additions & 15 deletions

File tree

test/patch-django

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
#
99

1010
build=$PWD
11-
django=$(python -c "import django; print django.__path__[0]")
11+
django=$(python -c "import django; import os.path; print os.path.realpath(django.__path__[0])")
1212

1313
rsync -Cav $django $build/test/lib/
14-
cd $build/test/lib/
15-
patch -p 2 < $build/test/r5105.patch
16-
17-
exit 0
14+
cd $build/test/lib
15+
patch -p 3 < $build/test/r5106.patch

test/r5106.patch

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,3 @@ Index: /django/trunk/django/core/management.py
99
+ rel_field = rel_field.rel.get_related_field()
1010
data_type = get_rel_data_type(rel_field)
1111
else:
12-
Index: /django/trunk/AUTHORS
13-
===================================================================
14-
--- /django/trunk/AUTHORS (revision 5102)
15-
+++ /django/trunk/AUTHORS (revision 5106)
16-
@@ -165,4 +165,5 @@
17-
Robert Myers <myer0052@gmail.com>
18-
Nebojša Dorđević
19-
+ Gopal Narayanan <gopastro@gmail.com>
20-
Fraser Nevett <mail@nevett.org>
21-
Sam Newman <http://www.magpiebrain.com/>

0 commit comments

Comments
 (0)