Commit Graph

13 Commits

Author SHA1 Message Date
James Turk
84764f727b mergeobject 2015-05-29 15:31:29 -04:00
James Turk
bd01e38f35 handle onetoone conflicts and deletes 2015-05-28 16:45:07 -04:00
James Turk
750061ebd6 error on 1:1 clash 2015-05-28 16:28:21 -04:00
James Turk
8d4bab0563 handle self-references 2015-05-28 16:06:48 -04:00
James Turk
8e603c6329 ensure no self-merges 2015-05-28 15:57:20 -04:00
James Turk
65f2ae7dac ensure same class 2015-05-28 15:55:35 -04:00
James Turk
dd07515cbb simplify reading of tests 2015-05-28 15:14:06 -04:00
James Turk
ed88a2f2b3 many2many stuff 2015-05-28 14:53:05 -04:00
James Turk
3662fe6c70 fix import in tests 2015-05-28 14:17:22 -04:00
James Turk
352e4d194f more tests 2015-05-28 08:41:38 -04:00
James Turk
4a373c4db2 so migrations can be created 2015-05-28 08:41:32 -04:00
James Turk
111c10e317 fix models 2015-05-28 08:41:14 -04:00
James Turk
b80f5eee04 testing an idea 2015-05-28 00:21:15 -04:00