From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 7 Feb 2018 22:23:32 +0300 (MSK) From: Ivan Zakharyaschev To: Alexey Appolonov In-Reply-To: <20180207185926.GA27017@gyle.altlinux.org> Message-ID: References: <20180207185926.GA27017@gyle.altlinux.org> User-Agent: Alpine 2.20 (LFD 67 2015-01-07) MIME-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="1807885841-1187924313-1518031412=:7714" Cc: devel-newbies@lists.altlinux.org Subject: Re: [newbies] [#200296] DONE py.git=1.4.34-alt2 X-BeenThere: devel-newbies@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: "devel@ where you _can_ ask" List-Id: "devel@ where you _can_ ask" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Feb 2018 19:23:32 -0000 Archived-At: List-Archive: This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1807885841-1187924313-1518031412=:7714 Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 8BIT 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 > --1807885841-1187924313-1518031412=:7714--