| *** ykarel|away is now known as ykarel | 04:57 | |
| *** akekane_ is now known as abhishekk | 06:03 | |
| *** rpittau|afk is now known as rpittau | 06:22 | |
| *** dpawlik6 is now known as dpawlik | 07:07 | |
| *** jpena|off is now known as jpena | 07:33 | |
| *** elodilles_pto is now known as elodilles | 08:12 | |
| *** ykarel is now known as ykarel|lunch | 08:27 | |
| *** sshnaidm|afk is now known as sshnaidm | 08:55 | |
| *** akekane_ is now known as abhishekk | 09:08 | |
| *** ykarel|lunch is now known as ykarel | 09:46 | |
| *** jcapitao is now known as jcapitao_lunch | 11:10 | |
| *** jpena is now known as jpena|lunch | 11:33 | |
| *** rlandy is now known as rlandy|rover | 11:41 | |
| *** jcapitao_lunch is now known as jcapitao | 11:56 | |
| *** jpena|lunch is now known as jpena | 12:24 | |
| *** jpena is now known as jpena|off | 12:33 | |
| zul | fungi: one more question after the parent has been merged and the child has a +2/+1 recheck should just kick if off correct? | 12:34 |
|---|---|---|
| fungi | zul: normally, children would be automatically enqueued into the gate pipeline when their git parents are, so if that didn't happen on its own there may also be some other problem with the change | 12:36 |
| zul | ok | 12:36 |
| fungi | which change isn't getting enqueued? | 12:37 |
| fungi | i can play spot-the-issue | 12:37 |
| zul | hold on | 12:49 |
| zul | i just rechecked it it https://review.opendev.org/c/starlingx/ha/+/802362 | 12:49 |
| fungi | zul: the problem there is that it has a git parent which can never appear in the branch history. its parent is change 788325 revision #2 (a1ce600), but what merged was change 788325 revision #4 (1f48745) | 12:53 |
| zul | so how do i fix it? | 12:53 |
| fungi | zuul tries to test it for you in check anyway by rebasing it on the branch tip, but can't enqueue it into the gate pipeline because gerrit will refuse to let it merge | 12:53 |
| fungi | rebasing it on the branch tip at this point is the simplest solution | 12:54 |
| zul | ok | 12:54 |
| fungi | the way you avoid it in the future is to always rebase child changes on updates you push for their parents | 12:54 |
| fungi | generally if i'm working on a series of git commits, i'll use git rebase -i and edit a particular commit in the series that way, so that when i git rebase --continue all the children are rebased on it automatically | 12:55 |
| fungi | gerrit also has a "rebase" button, though it will only work for trivial rebases (those where you don't need to resolve any merge conflicts) | 12:55 |
| zul | gotcha | 12:56 |
| *** ysandeep|PTO is now known as ysandeep | 13:26 | |
| *** dmellado_ is now known as dmellado | 14:24 | |
| *** jpena|off is now known as jpena | 14:43 | |
| clarkb | I do something similar but will typically do my edits at the end of my stack then commit them with annotations like squash into foo and squash into bar. Then I git rebase -i HEAD~X and reorder things. I find this trade off for slightly more complex rebase is worthwhile as it makes the actual writing of the changes simpler | 15:19 |
| fungi | i mainly avoid reordering unless necessary, as i often run into painful merge conflicts to resolve when i switch around commits touching the same or nearby blocks of code | 15:23 |
| *** rpittau is now known as rpittau|afk | 15:31 | |
| *** jpena is now known as jpena|off | 15:34 | |
| *** ykarel is now known as ykarel|away | 16:31 | |
| opendevreview | Clark Boylan proposed openstack/project-config master: Revert "Disable airship citylcoud nodepool provider" https://review.opendev.org/c/openstack/project-config/+/804417 | 16:40 |
| opendevreview | Merged openstack/project-config master: Revert "Disable airship citylcoud nodepool provider" https://review.opendev.org/c/openstack/project-config/+/804417 | 17:01 |
| *** sshnaidm is now known as sshnaidm|afk | 17:55 | |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!