agiliq / compass Goto Github PK

When switching between feature branches, sometimes there can be conflict because the same migration number appears in both:

python manage.py migrate baz 0001
- Soft matched migration 0001 to 0001_initial.
Running migrations for baz:
! Migration baz:0002_auto__add_field_foo_bar2
should not have been applied
before baz:0002_auto__add_field_foo_bar1 but was.
InconsistentMigrationHistory: Inconsistent migration history
The following options are available:
    --merge: will just attempt the migration ignoring any potential
    dependency conflicts.

Need to think about a way to resolve this.

Hi,
I have a git repo in which the django project I'd like to manage isn't the root of the git repo. That is so say, my directory structure looks something like:

/.git
/my_project/
/my_project/apps
/my_project/manage.py
...
/other_stuff/...

When I run git checkout, compass seems to thing the name of the django app containing the migrations is my_project
Otherwise, compass seems to work great. Keep up the good work.

Cheers,
Adam

"This hook is invoked by git merge, which happens when a git pull is done on a local repository. The hook takes a single parameter, a status flag specifying whether or not the merge being done was a squash merge. This hook cannot affect the outcome of git merge and is not executed, if the merge failed due to conflicts." source

As with #2, will definitely need to deal with conflict migrations.

We can add some messages to help and guide the installation, successful migration.

For simplicity, we're currently assuming a clean working directory. However, commands such as checkout, reset --hard can potentially lead to data loss if the working directory is not clean. We need to either add a warning, or refuse to run the hook in such case.