Conflict changeset differences seem backwards after a merge
![]()
We had a stream for development, and at some point in time branched it off into the current development stream for the next version. The older stream remained for a few final fixes, then another stream was created off of it for maintenance.
Now a bunch of development work has happened in the meanwhile, and a few maintenance fixes, and we want to merge some of these maint fixes into development. So I find a changeset, right-click, and apply to my workspace off the current dev stream. Let's say there's a merge conflict that is auto-resolved. The resulting "Merges" changeset seems non-intuitive... when I view the differences in eclipse, I'm seeing all changes on the development stream as if they were applied on top of the single maintenance change. I was expecting to see the difference with respect to the dev stream (so the changes from the maintenance fix applied on top of the existing development code).
If I view history of the file within the workspace I can get the info I want by explicitly comparing the new Merges changeset with the previous one from the dev stream.
My question then is why does the "Merges" diff contain all the development changes rather than the incoming maintenance change? Is this a side-effect of how streams were created, or is this just the way merges always work?
Thanks.
|