merge-tracking

How do I use the new SVN merge-tracking?

时间秒杀一切 提交于 2020-01-30 13:58:48
问题 In my existing (Pre-SVN 1.5) merge strategy, we create a copy of the Trunk (called BasePoint) at the moment of branch-creation for referencing later during the merge. When we need to merge a branch back into the trunk, we perform 2 operations. Merge from BasePoint to LatestTrunk (Trunk has likely moved on since the original branch) into Working copy of Branch and then commit. At this point we typically check that the merge into the branch has not damaged anything Merge from LatestTrunk to

SVN: Track merges

十年热恋 提交于 2019-12-17 20:34:11
问题 Is it possible in SVN 1.6 to track where a commit was merged. I'm especially interesting in UI based solution (Eclipse plugin will be great). 回答1: I once wrote a quite web-page that kind of did this. I can't give you the page, unfortunately, but I can give you an idea of what I did. First our development model - all development made to trunk, revisions then get merged into various release branches for different versions of products. I set up a web page with a column for each version and a row