Merge Tracking in Subversion: Making Branch‑to‑Trunk Workflows Reliable
Subversion’s merge tracking feature uses svn:mergeinfo to record which revisions have moved between branches, making repeated merges safe and idempotent.
Loading…
ReadMeFeed / Community knowledge
#merge-tracking
Real questions. Useful conversations. Find the people who know your stack.
subversionTaming the SVN Merge: Understanding svn:mergeinfo and the Cost of Cherry-Picking
Subversion tracks branch integration with svn:mergeinfo. Learn how merge tracking avoids double-merges, when cherry-picking creates property bloat, and how to safely inspect and dry-run a merge before committing.
svn:mergeinfo Bloat After Subdirectory Merges in Subversion 1.8: Consolidate or Leave It?
Our repository has been on Subversion 1.5+ merge tracking for years, and repeated merges at the subdirectory level have left many files and folders carrying their own svn:mergeinfo properties. The project is now standardizing on the 1.8 client behavior, and I want to define a policy for handling this accumulated metadata going forward. The concern is that sc
svn:mergeinfo: Overlap handling during concurrent merges
Goal Investigate how Subversion records merge ranges when multiple merge operations target the same branch concurrently. Background Subversion’s merge tracking uses the svn:mergeinfo property, which stores revision ranges applied to a path. The current implementation lacks a documented policy for handling overlapping ranges that arise from concurrent merges.