Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
osd: PGLog: split divergent priors as well #4631
might want to backport
PGLog: split divergent priors as well
DNM: PGLog: split divergent priors as well
changed the title from
May 10, 2015
@smithfarm I assume you did not cherry-pick -x 6de83d4 because it has conflicts. And that's why you chose to just add the get_hash function. In that case I think it's better to add that as a "Conflict" resolution in the original patch, with a comment explaining what you had to do and why you did it. So the reviewer understands the problem and can approve the solution you chose.
The problem with a minimalist approach is that it may create problems with future backports, if they need the full extent of 6de83d4 instead of just the get_hash backport you did. If that happens it may be necessary to try to backport 6de83d4 in full and resolve the conflict. And it will be necessary to relate to the partial backport you did to explain why part of the patch was already there and not the rest.
There seems to be only two rather limited conflicts when applying 6de83d4 (did not check if it compiles though, maybe that's the real problem). Did you try it ?