Hi I have a question on mergetracking. The dev team I am
part of have recently started using svnmerge.py to do mergetracking 1.5
mergetracking is currently not an option but I think the same issue
applies to 1.5 mergetracking). I am a bit unclear what is the best way
to proceed in the case where one wants to merge only part of a
changeset back from a particular branch back to trunk ? Should you
'svnmerge.py merge' back the changeset and then manually make the
required changes before commiting the merge ? Or should you get the
branch in order such that changesets are only merged back in their
entirety ? e.g Of one changeset consisting of 6 files I want to merge
5 back to trunk. Should I merge back the changeset to trunk and
then revert the 6th file before commiting the merge, Or must I first
undo the changes of the 6th file in the branch via a second changeset
and merge both changesets back to trunk ?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-21 18:38:45 CET