Commits

Anonymous committed 3941d6c

Add --skip back in.

Comments (0)

Files changed (2)

south/management/commands/migrate.py

                     db_dry_run = db_dry_run,
                     silent = silent,
                     load_inital_data = not options['no_initial_data'],
+                    skip = skip,
                 )
                 if result is False:
                     return

south/migration.py

     return problems
 
 
-def migrate_app(app, target_name=None, resolve_mode=None, fake=False, db_dry_run=False, yes=False, silent=False, load_inital_data=False):
+def migrate_app(app, target_name=None, resolve_mode=None, fake=False, db_dry_run=False, yes=False, silent=False, load_inital_data=False, skip=False):
     
     app_name = get_app_name(app)
     
                 ghost_migrations.append(m)
         except ImproperlyConfigured:
             pass
-            
-        
+    
     if ghost_migrations:
         if not silent:
             print " ! These migrations are in the database but not on disk:"
                 bad = True
             direction = -1
     
-    if bad and resolve_mode not in ['merge']:
+    if bad and resolve_mode not in ['merge'] and not skip:
         if not silent:
             print " ! Inconsistent migration history"
             print " ! The following options are available:"
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.