[soc2009/multidb] Resolved a number of strange merge conflicts that had arisen throughout various merges.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11777 bcc190cf-cafb-0310-a4f2-bffc1f526a37

TODO.txt

@@ -1,25 +0,0 @@
-TODO
-====
-
-The follow is a list, more or less in the order I intend to do them of things
-that need to be done.  I'm trying to be as granular as possible.
-
-
-1)  Replace old instances of :setting:`DATABASE_` with a new tag or something.
-
-2)  Update all management commands in the following way:
-
-    * ``dumpdata``: By default dump the ``default`` database.  Later add a
-      ``--database`` flag.
-
-    flush, reset, and syncdb need to not prompt the user multiple times.
-
-3)  Handle backends with custom Query classes.
-
-4)  Wait on the merge of the m2m stuff.
-
-5)  Fix django.contrib.gis, it's broken in all sorts of ways.
-
-6)  Generate SQL, instead of an error for nesting on different DBs.
-
-7)  Time permitting add support for a ``DatabaseManager``.

django/contrib/gis/tests/relatedapp/tests.py

@@ -293,6 +293,7 @@ class RelatedGeoModelTest(unittest.TestCase):
             self.assertEqual(4, len(coll))
             self.assertEqual(ref_geom, coll)
 
+
     # TODO: Related tests for KML, GML, and distance lookups.
 
 def suite():

docs/ref/databases.txt

@@ -257,6 +257,7 @@ Here's a sample configuration which uses a MySQL option file::
         }
     }
 
+
     # my.cnf
     [client]
     database = NAME

docs/ref/django-admin.txt

@@ -498,11 +498,6 @@ prompts.
 The :djadminopt:`--database` option can be used to specify the alias
 of the database to reset.
 
-Executes the equivalent of ``sqlreset`` for the given app name(s).
-
-The :djadminopt:`--noinput` option may be provided to suppress all user
-prompts.
-
 runfcgi [options]
 -----------------
 

docs/ref/templates/builtins.txt

@@ -65,16 +65,6 @@ Forgeries <ref-contrib-csrf>`.
 
 .. templatetag:: cycle
 
-csrf_token
-~~~~~~~~~~
-
-.. versionadded:: 1.1.2
-
-In the Django 1.1.X series, this is a no-op tag that returns an empty string for
-future compatibility purposes.  In Django 1.2 and later, it is used for CSRF
-protection, as described in the documentation for :ref:`Cross Site Request
-Forgeries <ref-contrib-csrf>`.
-
 cycle
 ~~~~~
 

docs/releases/1.2.txt

@@ -189,4 +189,3 @@ Django 1.2 adds the ability to use :ref:`more than one database
 issued at a specific database with the `using()` method on
 querysets; individual objects can be saved to a specific database
 by providing a ``using`` argument when you save the instance.
-

tests/regressiontests/backends/tests.py

@@ -19,21 +19,6 @@ class Callproc(unittest.TestCase):
         else:
             return True
 
-class LongString(unittest.TestCase):
-
-    def test_long_string(self):
-        # If the backend is Oracle, test that we can save a text longer
-        # than 4000 chars and read it properly
-        if settings.DATABASE_ENGINE == 'oracle':
-            c = connection.cursor()
-            c.execute('CREATE TABLE ltext ("TEXT" NCLOB)')
-            long_str = ''.join([unicode(x) for x in xrange(4000)])
-            c.execute('INSERT INTO ltext VALUES (%s)',[long_str])
-            c.execute('SELECT text FROM ltext')
-            row = c.fetchone()
-            c.execute('DROP TABLE ltext')
-            self.assertEquals(long_str, row[0].read())
-
 class LongString(unittest.TestCase):
 
     def test_long_string(self):