So a cherrypick as I understand it is merging in a specific revision (or set of revisions). Do we need any more documentation than this? Any caveats or issues that should be taken into consideration when writing this documentation up?
I see looking at the code that the weave algorithm doesn't handle cherrypicks, but merge3 does - however the practical implications are lost on me.
Feel free to point me at a bunch of links, I can work something out from there.
So a cherrypick as I understand it is merging in a specific revision (or set of revisions). Do we need any more documentation than this? Any caveats or issues that should be taken into consideration when writing this documentation up?
I see looking at the code that the weave algorithm doesn't handle cherrypicks, but merge3 does - however the practical implications are lost on me.
Feel free to point me at a bunch of links, I can work something out from there.