From 149e731c3c5a2cc96b7d3c72070401df6c2a238e Mon Sep 17 00:00:00 2001
From: Justin Bronn <jbronn@gmail.com>
Date: Sat, 19 Jul 2008 13:30:47 +0000
Subject: gis: Merged revisions
 7921,7926-7928,7938-7941,7945-7947,7949-7950,7952,7955-7956,7961,7964-7968,7970-7978
 via svnmerge from trunk.

This includes the newforms-admin branch, and thus is backwards-incompatible.  The geographic admin is _not_ in this changeset, and is forthcoming.


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 tests/regressiontests/admin_views/fixtures/string-primary-key.xml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 tests/regressiontests/admin_views/fixtures/string-primary-key.xml

(limited to 'tests/regressiontests/admin_views/fixtures/string-primary-key.xml')

diff --git a/tests/regressiontests/admin_views/fixtures/string-primary-key.xml b/tests/regressiontests/admin_views/fixtures/string-primary-key.xml
new file mode 100644
index 0000000000..8e1dbf047f
--- /dev/null
+++ b/tests/regressiontests/admin_views/fixtures/string-primary-key.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<django-objects version="1.0">
+    <object pk="1" model="admin_views.modelwithstringprimarykey">
+        <field type="CharField" name="id"><![CDATA[abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 -_.!~*'() ;/?:@&=+$, <>#%" {}|\^[]`]]></field>
+    </object>    
+</django-objects>
\ No newline at end of file
-- 
cgit v1.3