> Concretely I'll patch to master and would like to back-port to 7x right > away. As 7.0 is being rolled, 7.1 will be the entry in the change-log.
Correct. > I will ensure that master from the Apache git repo is clean, apply the > patch (including the update to CHANGE.txt) and commit. Then I will > check out branch_7x and cherry-pick the changed files, check that > everything works and commit. Not sure if I understand you right -- I'd just cherry-pick that particular commit directly from master (by its hash). Then test and if everything works, commit. It should merge cleanly, so no need to go through each file in isolation. D. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
