699104 - kuma: investigate merging kuma and mdn

Status: RESOLVED FIXED

(developer.mozilla.org Graveyard :: Wiki pages, defect)

Comment 1

[Les Orchard [:lorchard]]

Trying to keep to p=1, I'll just do a merge and see about sharing the highlights here with some commentary:

% git co master && git pull upstream mdn
% git co mdn && git pull mdn
% git co -b master-to-mdn-merge mdn
% git merge master

error: refusing to lose untracked file at 'scripts/rackspace-bootstrap.sh'
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Auto-merging Vagrantfile
CONFLICT (content): Merge conflict in Vagrantfile
Auto-merging apps/devmo/models.py
CONFLICT (content): Merge conflict in apps/devmo/models.py
Auto-merging apps/devmo/templates/devmo/profile.html
Auto-merging apps/devmo/tests/test_models.py
CONFLICT (content): Merge conflict in apps/devmo/tests/test_models.py
Auto-merging apps/devmo/tests/test_views.py
CONFLICT (content): Merge conflict in apps/devmo/tests/test_views.py
Auto-merging apps/devmo/views.py
Auto-merging apps/landing/templates/landing/home.html
CONFLICT (content): Merge conflict in apps/landing/templates/landing/home.html
Auto-merging apps/landing/test_views.py
Auto-merging apps/landing/urls.py
Auto-merging configs/htaccess
CONFLICT (content): Merge conflict in configs/htaccess
Removing media/js/libs/django/urlify.js
Auto-merging puppet/files/etc/hosts
CONFLICT (add/add): Merge conflict in puppet/files/etc/hosts
Auto-merging puppet/files/etc/httpd/conf.d/mozilla-kuma-apache.conf
CONFLICT (content): Merge conflict in puppet/files/etc/httpd/conf.d/mozilla-kuma-apache.conf
Auto-merging puppet/files/etc/issue
CONFLICT (add/add): Merge conflict in puppet/files/etc/issue
Auto-merging puppet/files/etc/motd
CONFLICT (add/add): Merge conflict in puppet/files/etc/motd
Auto-merging puppet/files/etc/sysconfig/network
CONFLICT (add/add): Merge conflict in puppet/files/etc/sysconfig/network
Auto-merging puppet/manifests/classes/dev-hacks.pp
CONFLICT (content): Merge conflict in puppet/manifests/classes/dev-hacks.pp
Auto-merging puppet/manifests/classes/site-config.pp
CONFLICT (content): Merge conflict in puppet/manifests/classes/site-config.pp
Auto-merging scripts/build.sh
Auto-merging scripts/update_site.py
CONFLICT (content): Merge conflict in scripts/update_site.py
Auto-merging settings.py
Auto-merging templates/base.html
Auto-merging urls.py
CONFLICT (rename/rename): Rename "scripts/centos55-bootstrap.sh"->"scripts/centos-bootstrap.sh" in branch "HEAD" rename "scripts/centos55-bootstrap.sh"->"scripts/rackspace-bootstrap.sh" in "master"
Automatic merge failed; fix conflicts and then commit the result.

Comment 2

[Les Orchard [:lorchard]]

TL;DR - On a quick overflight of the merge results, I think these are immediate next steps:

* Trouble in apps/devmo; try merge again after the auth switch with bug 674635 is completed.

* There's trouble in apps/landing to sort out.

* Hand-resolve conflicts in configs/htaccess

* Investigate some files that unexpectedly merged without issue.
    * (eg. settings.py, urls.py, templates/base.html)

* Rework scripts/update_site.py so it only knows about the unified branch

* Spend some time untangling the mess made of Vagrant + Puppet - probably my gig, alas.

Comment 3

[Les Orchard [:lorchard]]

I feel like each of the above 6 bullets represents roughly a 1-pointer bug. I could file each of those, but it feels like the whole set is probably best addressed in the same feature branch and by the same dev. And also, pending completion of bug 674635

Comment 4

[Luke Crouch [:groovecoder]]

Cool, let's close this bug and I'll create 1.7 bugs for those.