On 7/18/20 10:11 AM, Luca Toscano wrote: > Hi Ruediger, > > On Wed, Jul 15, 2020 at 10:04 AM Ruediger Pluem <rpl...@apache.org> wrote: >> >> >> On 7/15/20 9:06 AM, Luca Toscano wrote: >>> Hi everybody, >>> >>> getting back on this. I checked mergeinfo and r1879253 r1879348 are >>> not listed, what is the best path forward to fix this? (Asking because >>> I have never merged from trunk, and I am not sure what is the best >>> path forward). >> >> Try >> >> svn merge --record-only -c 1879253,1879348 >> https://svn.apache.org/repos/asf/httpd/httpd/trunk . >> >> in a freshly svn up'ed working copy of 2.4.x. > > Thanks for the answer. IIUC the above command takes care of updating > mergeinfo with the missing revs, but the problem is (I think) that > they didn't get merged in the first place along with the others (so > they are missing from 2.4.x). Since I never merged commits into 2.4.x, > I was wondering what to do to avoid messing up the state :)
Good catch. The backport was incomplete as only the first of the list of revisions was backported. Fixed in r1880060. Regards Rüdiger
