[PATCH] Add ability to mark change sets as merged
From: Daniel Rall <dlr_at_collab.net>
Date: 2006-03-25 01:58:29 CET
This is effectively a way to manipulate the merge memory stored in the
Use case: A change set which is sufficiently different when backported
o The actual change you want to apply to branch has no overlap with
o Only a subset of a change set warrants application.
o The branch content has drifted far enough apart to make automatic
Typical usage is paired with manually-issued, targeted 'svn merge'
-- Daniel Rall p.s. On a related note, I've got 'svnmerge.py rollback [--memory]' stubbed out too. Incidently, these changes are to implement the "Record Manual Merge" and "Rollback Merge" requirements mentioned in Subversion's Merge Tracking Requirements doc <http://subversion.tigris.org/merge-tracking/requirements.html>
This is an archived mail posted to the Subversion Dev mailing list.