Atualização para IFRN/Master - 26/01/2017
Dados gerais
| Branch Criada no IFCE | atualizacao_ifrn_26012017 |
| Tag Base do IFRN | master |
| Data de início da atualização | 26/01/2017 |
Pacotes (/opt/suap/deploy/requirements.txt)
Passo 1
Comandos iniciais
git checkout -b atualizacao_ifrn_26012017 git remote add suapifrn http://gitlab.ifrn.edu.br/cosinf/suap.git
Passo 2
Baixar as atualizações do IFRN
git fetch suapifrn
Username for 'https://gitlab.ifrn.edu.br':
Password for 'https://ifce@gitlab.ifrn.edu.br':
Git fetch
From http://gitlab.ifrn.edu.br/cosinf/suap 2ba78f1..76314b2 central-servicos-generalizacao -> suapifrn/central-servicos-generalizacao * [new branch] coverage -> suapifrn/coverage * [new branch] data_driven_testing -> suapifrn/data_driven_testing * [new branch] demanda_104 -> suapifrn/demanda_104 9866b68..7e07a3e demanda_30 -> suapifrn/demanda_30 * [new branch] demandas_git_1 -> suapifrn/demandas_git_1 * [new branch] edu-cartao-trello -> suapifrn/edu-cartao-trello * [new branch] edu-cartao-trello-66 -> suapifrn/edu-cartao-trello-66 * [new branch] edu-cartao-trello-69 -> suapifrn/edu-cartao-trello-69 * [new branch] edu-chamado-32600 -> suapifrn/edu-chamado-32600 * [new branch] edu-chamado-32602 -> suapifrn/edu-chamado-32602 * [new branch] edu-chamado-32796 -> suapifrn/edu-chamado-32796 * [new branch] edu-corrigir-indicadores -> suapifrn/edu-corrigir-indicadores 2907f5f..1c31e85 edu-demandas-aprendizagem -> suapifrn/edu-demandas-aprendizagem * [new branch] edu-importacao-edital -> suapifrn/edu-importacao-edital * [new branch] etep-chamado-32603 -> suapifrn/etep-chamado-32603 * [new branch] etep-remover-secretario -> suapifrn/etep-remover-secretario * [new branch] layout -> suapifrn/layout 66acad6..9485ba0 master -> suapifrn/master e918f74..7c72c25 processo_eletronico -> suapifrn/processo_eletronico f242ff6..006237b sica_ifrn -> suapifrn/sica_ifrn 6ed2fc9..c4489b2 suap_gestao_demanda_62 -> suapifrn/suap_gestao_demanda_62
Passo 4
Fazer o merge da tag “suapifrn/master” com a branch “atualizacaoifrn01012017” do IFCE e resolver os conflitos.
git merge suapifrn/master
Saída:
Auto-merging suap/settings_base.py CONFLICT (content): Merge conflict in suap/settings_base.py Auto-merging rh/views.py Auto-merging rh/urls.py Auto-merging rh/menu.json Auto-merging rh/importador.py Auto-merging rh/forms.py Auto-merging rh/admin.py Auto-merging protocolo/views.py Auto-merging projetos/migrations/0046_auto_20151001_1152.py CONFLICT (content): Merge conflict in projetos/migrations/0046_auto_20151001_1152.py Removing projetos/menu.xml Auto-merging projetos/forms.py Auto-merging ponto/views.py Auto-merging planejamento/views.py CONFLICT (content): Merge conflict in planejamento/views.py Auto-merging planejamento/tests.py Auto-merging planejamento/models.py Removing planejamento/graficos.py Auto-merging planejamento/forms.py Auto-merging planejamento/admin.py Auto-merging pesquisa/management/commands/gerar_bolsas_ae_pesquisa.py Auto-merging patrimonio/views.py CONFLICT (content): Merge conflict in patrimonio/views.py Auto-merging patrimonio/templates/inventario.html Auto-merging patrimonio/relatorio.py CONFLICT (content): Merge conflict in patrimonio/relatorio.py Auto-merging patrimonio/models.py CONFLICT (content): Merge conflict in patrimonio/models.py Auto-merging patrimonio/forms.py CONFLICT (content): Merge conflict in patrimonio/forms.py Auto-merging ldap_backend/templates/search.html Removing gitlab/views.py Removing gitlab/urls.py Removing gitlab/tests.py Removing gitlab/templates/gantt.tmpl.html Removing gitlab/templates/demo.html Removing gitlab/static/gitlab/gantt.css Removing gitlab/static/gitlab/demo_sample_data.js Removing gitlab/static/gitlab/demo/ext/js/moment.js Removing gitlab/static/gitlab/demo/ext/js/angular.min.js Removing gitlab/static/gitlab/demo/ext/js/angular.js Removing gitlab/static/gitlab/demo/ext/js/angular-strap.tpl.min.js Removing gitlab/static/gitlab/demo/ext/js/angular-strap.tpl.js Removing gitlab/static/gitlab/demo/ext/js/angular-strap.min.js Removing gitlab/static/gitlab/demo/ext/js/angular-strap.js Removing gitlab/static/gitlab/demo/ext/js/angular-animate.min.js Removing gitlab/static/gitlab/demo/ext/js/angular-animate.js Removing gitlab/static/gitlab/demo/ext/fonts/glyphicons-halflings-regular.woff Removing gitlab/static/gitlab/demo/ext/fonts/glyphicons-halflings-regular.ttf Removing gitlab/static/gitlab/demo/ext/fonts/glyphicons-halflings-regular.svg Removing gitlab/static/gitlab/demo/ext/fonts/glyphicons-halflings-regular.eot Removing gitlab/static/gitlab/demo/ext/fonts/fontawesome-webfont.woff Removing gitlab/static/gitlab/demo/ext/fonts/fontawesome-webfont.eot Removing gitlab/static/gitlab/demo/ext/fonts/FontAwesome.otf Removing gitlab/static/gitlab/demo/ext/css/font-awesome.min.css Removing gitlab/static/gitlab/demo/ext/css/font-awesome.css Removing gitlab/static/gitlab/demo/ext/css/bootstrap.min.css Removing gitlab/static/gitlab/demo/ext/css/bootstrap.css Removing gitlab/static/gitlab/demo/ext/css/angular-motion.min.css Removing gitlab/static/gitlab/demo/ext/css/angular-motion.css Removing gitlab/static/gitlab/demo/demo_sample_data.js Removing gitlab/static/gitlab/demo/demo.js Removing gitlab/static/gitlab/demo/css/gantt-twbs.css Removing gitlab/static/gitlab/demo/css/gantt-demo.css Removing gitlab/static/gitlab/demo.js Removing gitlab/static/gitlab/assets/gantt.css Removing gitlab/static/gitlab/assets/angular-gantt.js Removing gitlab/static/gitlab/angular-gantt.min.js Removing gitlab/static/gitlab/angular-gantt.js Removing gitlab/models.py Removing gitlab/forms.py Removing gitlab/__init__.py Auto-merging frota/views.py Auto-merging frota/models.py Auto-merging frota/forms.py Auto-merging frota/admin.py Auto-merging estagios/models.py Auto-merging estagios/forms.py Auto-merging edu/templates/tabs/aluno_dados_academicos.html Auto-merging edu/templates/tabs/aluno_atividades_estudantis.html Auto-merging edu/models.py CONFLICT (content): Merge conflict in edu/models.py Auto-merging djtools/utils.py Auto-merging djtools/templatetags/tags.py Auto-merging djtools/templatetags/filters.py Removing djtools/templates/graficos/grafico2D.html Removing djtools/templates/graficos/grafico1D.html Removing djtools/models.py Auto-merging djtools/html/graficos/__init__.py Removing djtools/graficos/models.py Removing djtools/graficos/__init__.py Auto-merging djtools/etiquetas/labels.py Removing djtools/dbfields.py Auto-merging djtools/choices/__init__.py Auto-merging djtools/adminutils.py Auto-merging deploy/requirements.txt CONFLICT (content): Merge conflict in deploy/requirements.txt Auto-merging contratos/views.py Auto-merging contratos/models.py Auto-merging comum/webservice.py Auto-merging comum/views.py CONFLICT (content): Merge conflict in comum/views.py Auto-merging comum/utils.py Auto-merging comum/urls.py Auto-merging comum/templates/login.html CONFLICT (content): Merge conflict in comum/templates/login.html Auto-merging comum/templates/index.html CONFLICT (content): Merge conflict in comum/templates/index.html CONFLICT (modify/delete): comum/template/tags.py deleted in suapifrn/master and modified in HEAD. Version HEAD of comum/template/tags.py left in tree. CONFLICT (modify/delete): comum/template/filters.py deleted in suapifrn/master and modified in HEAD. Version HEAD of comum/template/filters.py left in tree. Removing comum/template/__init__.py Removing comum/static/comum/img/index-banner.png Removing comum/static/comum/img/icon-senha.png Removing comum/static/comum/img/icon-protocolo.png Removing comum/static/comum/img/icon-pratica.png Removing comum/static/comum/img/icon-documento.png Removing comum/static/comum/img/icon-certificado.png Auto-merging comum/static/comum/fonts/fontawesome-webfont.ttf Auto-merging comum/static/comum/fonts/fontawesome-webfont.svg Auto-merging comum/static/comum/css/login.css CONFLICT (content): Merge conflict in comum/static/comum/css/login.css Auto-merging comum/static/comum/css/estilo.css Auto-merging comum/models.py Auto-merging comum/forms.py Removing comum/enums.py Removing comum/choices.py Removing comum/arial10.py Auto-merging almoxarifado/views.py Auto-merging almoxarifado/templates/entrada.html Auto-merging almoxarifado/models.py Auto-merging almoxarifado/menu.json CONFLICT (content): Merge conflict in almoxarifado/menu.json Removing almoxarifado/labels.py Auto-merging almoxarifado/forms.py Auto-merging ae/views.py Automatic merge failed; fix conflicts and then commit the result.
Passo 5
Rodar o sync
CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0026_auto_20161122_0905, 0025_config_data_depreciacao in patrimonio). To fix them run 'python manage.py makemigrations --merge'
Foi resolvido com:
python manage.py makemigrations –merge
E depois:
python manage.py sync
Saída do sync:
Running migrations: Rendering model states... DONE Applying rh.0042_afastamentosiape_interrompe_tempo_servico... OK Applying rh.0043_popular_afastamentosiape_interrompe_tempo_servico...Populando atributo "AfastamentoSiape.interrompe_tempo_servico" OK Applying acumulocargo.0001_initial... OK Applying ae.0037_auto_20161111_0955... OK Applying cnpq.0022_parametro... OK Applying cnpq.0023_auto_20161104_1730_popular_parametro...Installed 629 object(s) from 15 fixture(s) OK Applying demandas.0007_auto_20161202_1004... OK Applying demandas.0008_auto_20161202_1603... OK Applying demandas.0009_auto_20161206_1056... OK Applying demandas.0010_anexos... OK Applying demandas.0011_auto_20161207_1535... OK Applying demandas.0012_auto_20161212_1051... OK Applying demandas.0013_auto_20161213_1116... OK Applying demandas.0014_auto_20161213_1118... OK Applying demandas.0015_auto_20161213_1140... OK Applying demandas.0016_auto_20161213_1141... OK Applying demandas.0017_auto_20161213_1143... OK Applying demandas.0018_auto_20161219_1340... OK Applying demandas.0019_remove_demanda_demanda_consolidada... OK Applying demandas.0020_notainterna... OK Applying edu.0149_auto_20161117_1051... OK Applying edu.0150_auto_20161117_1054... OK Applying edu.0144_auto_20161025_1610... OK Applying edu.0149_merge... OK Applying edu.0151_merge... OK Applying edu.0152_auto_20161212_0749... OK Applying edu.0153_componentecurricular_segundo_semestre... OK Applying edu.0154_auto_20170102_1309... OK Applying estagios.0016_auto_20161202_1545... OK Applying estagios.0017_auto_20161229_1319... OK Applying etep.0001_initial... OK Applying patrimonio.0025_config_data_depreciacao... OK Applying patrimonio.0027_merge... OK Applying pesquisa.0024_auto_20161104_1739_atualiza_parametro_edital... OK Applying pesquisa.0025_auto_20161104_1745... OK Applying pesquisa.0026_edital_ch_semanal_coordenador... OK Applying plan_v2.0028_auto_20161223_0734... OK Applying ponto.0007_observacao_data_cadastro... OK Applying projetos.0062_auto_20161116_1522... OK Applying projetos.0063_auto_20161117_1139... OK Applying rh.0044_pessoajuridica_nome_fantasia... OK Applying saude.0031_auto_20161125_0936... OK