The template is created in the trunk, amended in the trunk a day later. The next day a branch is created and the template is amended in the branch. And the next day it is merged back to the trunk.
trunk - create the template on 2019-1-1 in version 1.00
trunk - amended the template on 2019-1-2 in version 1.00
branch - amended the template on 2019-1-3 in version 1.00 (branch)
trunk - merged the branch back to the trunk on 2019-1-4 in version 1.10
now in the trunk I would expect the following in the code history:
insert - trunk - 1.00 - 2019-1-1
update - trunk - 1.00 - 2019-1-2
update - branch - 1.10 - 2019-1-4
and in the branch the following:
insert - trunk - 1.00 - 2019-1-1
update - trunk - 1.00 - 2019-1-2
update - branch - 1.00 - 2019-1-3
what i actually get after merging is this in the trunk history:
update - trunk - 1.10 - 2019-1-3
and this in the branch history:
update - branch - 1.00 - 2019-1-4
Can someone inform me on if my expectations are correct?
Best answer by Anne Buit
View original