"Adam D. Barratt" <[email protected]> writes: > On 2015-10-12 13:13, Arto Jantunen wrote: >> "Adam D. Barratt" <[email protected]> writes: >> >>> Control: tags -1 + moreinfo >>> >>> On Sat, 2015-10-10 at 09:43 +0300, Arto Jantunen wrote: >>>> I would like to update bcfg2 in stable to match the version currently in >>>> testing to enable it to work with Django 1.7 (bug #755645). To do this I >>>> would >>>> add the attached patch, which looks much worse than it is due to the db >>>> migration files being moved around. >>> >>> That is rather noisy, yes. :-( >>> >>> Is there any chance we could have an interdiff of the before-and-after >>> patches, to highlight the actual differences between them? In any case >>> we'd need a full debdiff of a package built and tested on jessie before >>> giving a definite ack. >> >> The patch doesn't exist in jessie, so either interdiff isn't possible or >> I'm misunderstanding something. > > The latter, although possibly because I wasn't clear enough. > > The patch contains, for example: > > src/lib/Bcfg2/Reporting/migrations/0001_initial.py | 1006 > +++++++++++--------- > .../migrations/0002_convert_perms_to_mode.py | 171 ---- > .../Reporting/south_migrations/0001_initial.py | 465 +++++++++ > .../south_migrations/0002_convert_perms_to_mode.py | 171 ++++ > > What I was looking for was an indication of what the actual difference between > the two sets of files is, ignoring renames (e.g. are the two > 0002_convert_perms_to_mode.py files actually exactly the same?).
All of those migration files are exactly the same after renaming from migrations to south_migrations. I assume the reason for the renaming to be changes made to the Django machinery that applies them. -- Arto Jantunen
