FIX: conflict in settings.py

[myslice.git] / README

diff --git a/README b/README
index a38c08b..21a79b8 100644 (file)
--- a/README
+++ b/README
@@ -211,17 +211,40 @@ that would reset all-static/ and all-templates/ for you from the other contents
 
 ======== update django database to reflect changes in existing models without any migration system (e.g., south) =========
 
+# older version
 $python manage.py reset <your_app>
-#Django 1.5.1
+
+#Django 1.5.1 or later
 $python manage.py flush
 
 This will update the database tables for your app, but will completely destroy any data that existed in those tables. 
 If the changes you made to your app model do not break your old schema (for instance, you added a new, optional field) 
 you can simply dump the data before and reload it afterwards, like so:
 
-
+$python manage.py syncdb
 $python manage.py dumpdata <your_app> > temp_data.json
-$python manage.py reset <your_app>
+$python manage.py flush
 $python manage.py loaddata temp_data.json
 
 If your changes break your old schema this won't work - in which case tools like south or django evolution are great.
+
+======== update django database to reflect changes in existing models with migration system (e.g., south) =========
+
+As south is already installed , you just have to do:
+
+$./manage.py migrate
+
+if it fails:
+
+1. go to myslice directory
+2. do sqlite3 myslice.sqlite3 [if sqlite3: command not found, do $apt-get install sqlite3]
+3. check the list of tables with sqlite> .tables
+4. if you find those tables that was mentioned in the failure message while running $./manage.py migrate
+       do sqlite> DROP TABLE mentioned_table 
+       [mentioned_table = the tables that was explicity mentioned in the failure message of $./manage.py migrate]
+5. sqlite> .quit
+6. $./manage.py migrate  
+
+
+
+