)]}'
{"zuul/merger/merger.py":[{"author":{"_account_id":4146,"name":"Clark Boylan","email":"cboylan@sapwetik.org","username":"cboylan"},"change_message_id":"e40261375aec334d30341294e18ed20896d0ce08","unresolved":false,"context_lines":[{"line_number":473,"context_line":"    def isUpdateNeeded(self, repo_state, zuul_event_id\u003dNone):"},{"line_number":474,"context_line":"        repo \u003d self.createRepoObject(zuul_event_id)"},{"line_number":475,"context_line":"        refs \u003d [x.path for x in repo.refs]"},{"line_number":476,"context_line":"        for ref, rev in repo_state.items():"},{"line_number":477,"context_line":"            # Check that each ref exists and that each commit exists"},{"line_number":478,"context_line":"            if ref not in refs:"},{"line_number":479,"context_line":"                return True"}],"source_content_type":"text/x-python","patch_set":2,"id":"7faddb67_0239d4cd","line":476,"updated":"2019-08-27 16:43:55.000000000","message":"One thing that isn\u0027t entirely clear to me is if repo_state.items() will have all the new refs for a change against a new branch.\n\nIn our example case the new branch was called python3. I think what happens then is the change comes in, mergers merge it and we get a repo_state that includes refs/origin/master/python3 and refs/heads/python3. But the local repo doesn\u0027t have that so we update.\n\nHowever in reading the executor code we do the change merging after the repo update. Does that mean we actually do two merge passes for every proposed change? the first to sort out config then the second is on the executor and what will actually be tested?","commit_id":"10e6d418e0420c7fdc941a5525ecb75bc871f838"},{"author":{"_account_id":9311,"name":"Tristan Cacqueray","email":"tdecacqu@redhat.com","username":"tristanC"},"change_message_id":"de4e2074d70055b9d07b564db6240556d4fcdc8d","unresolved":false,"context_lines":[{"line_number":473,"context_line":"    def isUpdateNeeded(self, repo_state, zuul_event_id\u003dNone):"},{"line_number":474,"context_line":"        repo \u003d self.createRepoObject(zuul_event_id)"},{"line_number":475,"context_line":"        refs \u003d [x.path for x in repo.refs]"},{"line_number":476,"context_line":"        for ref, rev in repo_state.items():"},{"line_number":477,"context_line":"            # Check that each ref exists and that each commit exists"},{"line_number":478,"context_line":"            if ref not in refs:"},{"line_number":479,"context_line":"                return True"}],"source_content_type":"text/x-python","patch_set":2,"id":"7faddb67_026f94fa","line":476,"in_reply_to":"7faddb67_0239d4cd","updated":"2019-08-27 17:20:55.000000000","message":"iiuc there is indeed 2 merges per change.","commit_id":"10e6d418e0420c7fdc941a5525ecb75bc871f838"}]}