[15:15] <dholbach> hey mhall119
[15:15] <dholbach> dpm said there were some deployment issues?
[15:16] <mhall119> dholbach: yeah, the make migrate-${mp#} failed
[15:16] <mhall119> not deployment, just testing the upgrade locally
[15:16] <dholbach> do you have a log?
[15:16] <mhall119> no, but I can re-create it
[15:16] <dholbach> that'd be great
[15:16] <mhall119> are you working today? I thought you were visiting friends
[15:17] <dholbach> I'm working, but from Lisa's sister's place :)
[15:17] <mhall119> or are they all still asleep?
[15:17] <dholbach> they are still asleep
[15:17] <mhall119> :)
[15:17] <dholbach> but me being somewhat jetlagged still, I decided to start working early :)
[15:18] <dholbach> and I had a call with dpm at 7 in the calendar which we didn't cancel beforehand, so I thought "whatever, let's start working" :)
[15:18] <mhall119> you need to work on this whole "going on holiday thing"
[15:19] <dholbach> we were at the beach with the kids for the majority of the weekend - I'm fine :)
[15:19] <mhall119> ok, let me re-run it and I'll pastebin you the output
[15:19] <dholbach> awesome, thanks
[15:44] <mhall119> dholbach: so I'm trying with a clean environemnt this time (no virtualenv, no pip-cache) and it's failing to install Django==1.8.5 because it's not in the pip-cache
[15:44] <dholbach> ok... so that's easily fixed
[15:44] <dholbach> I'm surprised it's 1.8.5
[15:45] <dholbach> which version of the branch are you looking at?
[15:45] <mhall119> yeah, but pip-cache-revno.txt didn't get updated to point to the newest rev of the dependencies branch
[15:46] <dholbach> can you maybe just do a local pip update and see if that makes it work?
[15:46] <dholbach> I never quite understood what to do with the pip caches, it'd be good to rule out that the branch itself is broken somehow
[15:46] <mhall119> I'm updating the pip-cache-revno.txt to 20
[15:46] <dholbach> and which branch and revno is the project itself?
[15:47] <dholbach> just so I can replicate what you look at locally
[15:48] <mhall119> one second, that terminal is busy
[15:48] <mhall119> I had to re-apply the changes that davidcalle reverted from the branch
[15:49] <mhall119> because it won't let me merge it, since it's already in trunk's revision history
[15:49] <mhall119> maybe there was something newer after that revision that I was missing
[15:49] <mhall119> do you know of a way to force a merge that's already happened in the past?
[15:51] <dholbach> so revert the revert davidcalle did?
[15:53] <mhall119> yeah
[15:53] <dholbach> bzr revert --no-backup -r <revno>?
[15:54] <mhall119> ok, updating the pip-cache-revno.txt fixed the issue of installing Django==1.8.5
[15:55] <dholbach> which branch (in LP) are you looking at?
[15:55] <mhall119> lp:developer-ubuntu-com
[15:56] <mhall119> rev 188
[15:56] <dholbach> ok... because https://code.launchpad.net/~developer-ubuntu-com-dev/developer-ubuntu-com/django-1.8-cms-2.3 is already updated to Django==1.8.8
[15:56] <dholbach> the latter already has a bunch of other fixes landed
[15:56] <dholbach> and https://code.launchpad.net/~dholbach/developer-ubuntu-com/rework-importer has changes on top of that (mostly concerning the importer though)
[15:57] <dholbach> I never figured out which process we use for reviewing and landing things
[15:59] <mhall119> dholbach: so I was trying to apply https://code.launchpad.net/~developer-ubuntu-com-dev/developer-ubuntu-com/1470715/+merge/268471
[15:59] <mhall119> is there a different branch I should be merging into trunk instead?
[16:00] <dholbach> I don't quite know what davidcalle had in mind
[16:00] <dholbach> ~developer-ubuntu-com-dev/developer-ubuntu-com/django-1.8-cms-2.3 is an evolution of ~developer-ubuntu-com-dev/developer-ubuntu-com/1470715
[16:00]  * davidcalle catches up
[16:00] <dholbach> and ~dholbach/developer-ubuntu-com/rework-importer has the importer rewrite on top of that
[16:01] <dholbach> so I'd say let's go with the latter
[16:01] <dholbach> davidcalle said he had reviewed most of the changes already
[16:01] <mhall119> ok, but I can't simply merge ~developer-ubuntu-com-dev/developer-ubuntu-com/1470715 into trunk anymore
[16:02] <mhall119> and your revert command undid a bunch of other things related to api docs importing
[16:02] <dholbach> mhall119: I think that's because it has been merged already and was partly backed out, etc
[16:02] <mhall119> yeah, it's become a revision history mess
[16:02] <dholbach> I'd ignore the branch
[16:02] <davidcalle> And +1 ing it, indeed. So: my idea was to merge rework-importer into django-1.8-cms-2.3, then merge the latter into trunk
[16:03] <davidcalle> mhall119: dholbach: is there something blocking that "plan"?
[16:03] <dholbach> WFM!
[16:03] <mhall119> davidcalle: if django-1.8-cms-2.3 is based on 1470715, then you're going to have a bad time merging it into trunk
[16:03] <davidcalle> Hmm
[16:03] <dholbach> in the future (once we have smaller proposed changes again), I'd really like it if we had a more formal way of landing things... or at least a way how I can say "here's a change, please let's review, test and land it together" - I'd be happy to help with reviewing other branches as well... I'd just feel more comfortable that way
[16:03] <davidcalle> +1
[16:03] <dholbach> mhall119: I think it should be fine to merge it
[16:04] <mhall119> ok, jumping on a call, then I'll try that
[16:04] <dholbach> <3
[16:09] <dholbach> ok, looks like there's conflicts when trying to merge django-1.8-cms-2.3 and trunk
[16:09] <dholbach> if you want, I can try to merge trunk into the latter and resolve things?
[16:16] <dholbach> resolving the conflicts was fine, but the changes are huge...
[16:16] <dholbach> davidcalle: ^
[16:17] <dholbach> ho hum
[16:17] <davidcalle> dholbach: other changes than the general upgrade?
[16:17] <dholbach> that seems to drop a lot of required changes for the upgrade
[16:18] <dholbach> I just tried to update the django-1.8-cms-2.3 branch with what happened in trunk in the meantime
[16:18] <dholbach> I'll be back in a bit for the team call
[16:20] <davidcalle> dholbach: I only see a few conflicts on my end, hmm
[16:28] <davidcalle> Sorry, misread what you wrote
[16:31] <dholbach> I guess we'll have to just merge django-1.8-cms-2.3 into trunk and then apply a few changes to resolve the conflicts
[16:31] <dholbach> I can put up a diff in a few
[16:31] <dholbach> do we do the team call?
[16:37] <davidcalle> dholbach: I'm on the call :)
[16:37] <dholbach> ...now? :)
[18:29] <dholbach> mhall119: so if you merge the django-1.8 branch into trunk, this is the diff after resolving conflicts: http://paste.ubuntu.com/14568773/
[18:29] <dholbach> maybe we can do that as a first step before we land the importer on top?
[19:21] <mhall119> dholbach: so do I merge first and then apply that diff, or just apply that diff directly, or just merge?
[19:23] <dholbach> hang on
[19:23] <dholbach> mhall119: first do the merge and watch it fail
[19:24] <dholbach> then apply http://paste.ubuntu.com/14569342/
[19:24] <dholbach> and run: bzr resolve
[19:25] <mhall119> whee, fun, ok let me try
[19:25] <dholbach> that should complete the merge
[19:32] <mhall119> yup, applied fully, re-building a local environment now
[19:32] <dholbach> <3
[19:33]  * mhall119 isn't used to dholbach being around after lunchtime here
[19:33] <dholbach> :)
[19:56] <mhall119> dholbach: there's no update-1470715 make target after doing the above, is it still needed?
[19:56] <dholbach> no, not really
[19:57] <dholbach> we need to run a migration step, but that should be it
[20:02] <mhall119> what's the proper command for that step?
[20:03] <mhall119> and do I need to do the first two steps from https://code.launchpad.net/~developer-ubuntu-com-dev/developer-ubuntu-com/1470715/+merge/268471 ?
[20:10] <dholbach> mhall119: ./manage.py migrate?
[20:10] <dholbach> the first commands would be good to run on the real site
[20:17] <mhall119> There is no South database module 'south.db.sqlite3' for your database. Please either choose a supported database, check for SOUTH_DATABASE_ADAPTER[S] settings, or remove South from INSTALLED_APPS
[20:18] <mhall119> it doesn't look like the merge+patch made the necessary changes to developer_portal/settings.py
[20:21] <dholbach> hum
[20:21] <dholbach> developer_portal/settings.py is unmodified?
[22:03] <mhall119> dholbach: there was a couple changes in your patch diff, but nothing to move away from south and mptt and such
[23:22] <dholbach> mhall119: http://bazaar.launchpad.net/~developer-ubuntu-com-dev/developer-ubuntu-com/django-1.8-cms-2.3/view/head:/developer_portal/settings.py does not have "south" in it
[23:24] <mhall119> well I didn't get those changes when I merged it into trunk, so it was probably in one of the revisions that was merged and then backed out on the other branch
[23:30] <dholbach> ugh
[23:30] <dholbach> ok...
[23:30] <dholbach> I don't know - how do we want to proceed
[23:30] <dholbach> do you want to push these changes to trunk and we work on trunk together to resolve this?
[23:31] <dholbach> it can't be too many changes until we get it to work again
[23:34] <dholbach> mhall119: ^
[23:35] <mhall119> I really don't want to break trunk
[23:35] <mhall119> and while there may be only a few changes to get it working, it's finding out what those changes are that might take a while
[23:40] <dholbach> ok
[23:40] <mhall119> dholbach: can you try rebasing the 1.8 branch on trunk?
[23:41] <mhall119> using bzr rebase?
[23:41] <dholbach> or we just create a soon-trunk branch
[23:41] <dholbach> and work on that until it's fully working
[23:41] <dholbach> I don't care
[23:41] <dholbach> I never used bzr rebase
[23:41] <mhall119> we could do that too
[23:41] <mhall119> either way would fix our revision history problem I think
[23:41] <dholbach> ok - can you push your changes to lp:~developer-ubuntu-com-dev/developer-ubuntu-com/soon-trunk?
[23:42] <mhall119> yeah, one second
[23:42] <dholbach> rock and roll
[23:43]  * mhall119 really isn't used to dholbach being around after 5pm his time
[23:43] <dholbach> sorry about that
[23:43] <mhall119> it's like the whole world is backwards
[23:43] <dholbach> yeah, I know :)
[23:43] <mhall119> branch pushed
[23:45] <dholbach> thanks
[23:45] <dholbach> looking at it now
[23:55] <dholbach> mhall119: I picked a bunch of changes from the branch, here's what's left: http://paste.ubuntu.com/14571488/
[23:55] <dholbach> or maybe I should rather say "where the 1.8 branch and trunk diverge"
[23:56] <dholbach> some of the changes are fine and things you recently introduced in trunk
[23:58] <mhall119> anything related to API docs importation should take what's in trunk
[23:58] <mhall119> and all the po files can just be re-generated
[23:59] <dholbach> updated: http://paste.ubuntu.com/14571528/