Hi, I've just come across an interesting scenario, which did not work as I expected.
I created a feature branch several months ago, and have been keeping it up to date from trunk periodically. There was a change towards the start that was required on the branch, but I did not want merged into trunk. Ever. So, I performed a record-only merge of that change into trunk. This change affected only two files, neither of which had additional changes to it (other than non-conflicting merged changes from trunk). It's getting to the point that I need to reintegrate this branch back into the trunk, so I did a test on it today. It seems that using the '--reintegrate' option of the merge command does not honour the previous mergeinfo that is present. These changes are still coming across in the merge. In short, the steps were: - Create feature_branch from tr...@r100 - Make change to alpha.txt and beta.txt in feature_branch in r105 (not to be merged back) - Perform record-only merge from feature_branch to trunk in r106 - Perform sync merge from trunk to feature_branch in r110 - Perform reintegrate merge from feature_branch to trunk (alpha.txt and beta.txt are showing as contents-modified) I'm going to try and knock up a reproduction recipe tomorrow, but I first wanted to check whether this was expected behavior. I know changes can be cherry-picked to be merged from the branch back to trunk, and the reintegrate process will 'ignore' these. But, can changes be cherry-picked *for exclusion* from a reintegrate merge? Or does reintegrate ignore the mergeinfo? Cheers, --- Daniel Becroft
