| JayF | frickler: cid and I are looking at 907665 ( https://review.opendev.org/c/openstack/requirements/+/907665 ) it's passing tests now, but needed a rebase. Attempting to rebase it using normal software dev practices made me feel like I had taken crazy pills... is there some trick to this? | 18:18 |
|---|---|---|
| clarkb | it looks like a normal rebase to me? I'm looking at the rebase of child change onto latest patchset of parent change and there are a handful of conflicts that need to be resolved per usualy | 18:24 |
| clarkb | then maybe the result of that first rebase need to be rebased on master too | 18:24 |
| frickler | JayF: cid: that stack is sadly a bit outdated, so yes, lots of work. what I'd do is: | 18:30 |
| frickler | a) rebase https://review.opendev.org/c/openstack/requirements/+/933484 onto master, which is the latest bot generated patch | 18:30 |
| frickler | b) rebase 907665 on top of that, but use "rebase -i" and drop the older version of the bot patch from the stack | 18:31 |
| frickler | both steps still involve a lot of conflict resolution that needs to be done manually | 18:31 |
| frickler | also note that https://review.opendev.org/c/openstack/requirements/+/924547 is the squashed, in theory mergeable version of the current stack, but it also needs a rebase, let me do that now | 18:33 |
| clarkb | oh ya always use rebase -i to select the commits you want | 18:33 |
| opendevreview | Dr. Jens Harbott proposed openstack/requirements master: Updated from generate-constraints https://review.opendev.org/c/openstack/requirements/+/924547 | 18:34 |
| frickler | ok, that was easy, just a single conflict with two newly added libs | 18:35 |
| JayF | okay the fact it was two stacked commits was completely lost on me | 19:07 |
| JayF | frickler: we should schedule a 1:1 if possible to go over the requirements bump process, I think I'm missing something trying to walk thru it with CID. Not right now though as my brain is toast from banging against this problem for an hour | 19:08 |
| JayF | IDK how much of it is me not getting it, or just me not wanting to accept the quantity of toil it appears to be | 19:12 |
| -opendevstatus- NOTICE: The Gerrit service on review.opendev.org will be offline momentarily at 20:30 utc (half an hour from now) to apply a configuration change | 20:03 | |
| -opendevstatus- NOTICE: The Gerrit service on review.opendev.org will be offline momentarily to apply a configuration change | 20:31 | |
| frickler | JayF: we can do that, but there's a local holiday here tomorrow, so likely next week would be better | 21:16 |
| JayF | no real rush :) | 23:45 |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!