Hello!
Ничего страшного, но подумай о том, как ты отрезолвил конфликт в исходнике
с тестами. У тебя же был там конфликт? А конфликт при мёрдже git не стал
бы показывать, если по сравнению с общим предком изменения были только у
тебя, а не в апстриме.
Раз конфликты были показаны, значит, а апстриме тоже были изменения в этом
месте. Стоит их рассмотреть.
On Wed, 7 Feb 2018, Girar Builder pender robot wrote:
http://git.altlinux.org/tasks/archive/done/_195/200296/logs/events.1.1.log
2018-Feb-07 18:53:52 :: task #200296 for sisyphus started by alexey:
#100 build 1.4.34-alt2 from /people/alexey/packages/py.git
2018-Feb-07 18:53:52 :: [i586] #100 py.git 1.4.34-alt2: build start
2018-Feb-07 18:53:52 :: [x86_64] #100 py.git 1.4.34-alt2: build start
2018-Feb-07 18:55:19 :: [x86_64] #100 py.git 1.4.34-alt2: build OK
2018-Feb-07 18:55:20 :: [i586] #100 py.git 1.4.34-alt2: build OK
2018-Feb-07 18:55:27 :: build check OK
2018-Feb-07 18:55:28 :: noarch check OK
2018-Feb-07 18:55:29 :: plan: src +1 -1 =18262, noarch +5 -5 =18613
2018-Feb-07 18:55:29 :: version check OK
2018-Feb-07 18:56:01 :: generated apt indices
2018-Feb-07 18:56:01 :: created next repo
2018-Feb-07 18:56:20 :: dependencies check OK
ssh: muxclient: master hello exchange failed
2018-Feb-07 18:56:39 :: [i586] #100 py-doc: install check OK
2018-Feb-07 18:56:39 :: [x86_64] #100 py-doc: install check OK
2018-Feb-07 18:56:56 :: [i586] #100 python-module-py: install check OK
2018-Feb-07 18:56:58 :: [x86_64] #100 python-module-py: install check OK
2018-Feb-07 18:57:16 :: [i586] #100 python-module-py-testing: install check OK
2018-Feb-07 18:57:16 :: [x86_64] #100 python-module-py-testing: install check OK
2018-Feb-07 18:57:39 :: [x86_64] #100 python3-module-py: install check OK
2018-Feb-07 18:57:40 :: [i586] #100 python3-module-py: install check OK
2018-Feb-07 18:58:02 :: [x86_64] #100 python3-module-py-testing: install check
OK
2018-Feb-07 18:58:03 :: [i586] #100 python3-module-py-testing: install check OK
2018-Feb-07 18:58:04 :: gears inheritance check OK
2018-Feb-07 18:58:04 :: srpm inheritance check OK
girar-check-perms: access to py ALLOWED for alexey: project leader welcomes
random builders
2018-Feb-07 18:58:04 :: acl check OK
2018-Feb-07 18:58:29 :: created contents_index files
2018-Feb-07 18:58:35 :: created hash files: noarch src
2018-Feb-07 18:58:37 :: task #200296 for sisyphus TESTED
2018-Feb-07 18:58:37 :: task is ready for commit
2018-Feb-07 18:58:42 :: repo clone OK
2018-Feb-07 18:58:42 :: packages update OK
2018-Feb-07 18:58:44 :: [noarch] update OK
2018-Feb-07 18:58:44 :: repo update OK
2018-Feb-07 18:58:50 :: repo save OK
2018-Feb-07 18:58:51 :: updated /gears/p/py.git branch `sisyphus'
2018-Feb-07 18:59:26 :: gears update OK
2018-Feb-07 18:59:26 :: task #200296 for sisyphus DONE
_______________________________________________
devel-newbies mailing list
[email protected]
https://lists.altlinux.org/mailman/listinfo/devel-newbies
