I've read through the functional spec at:
http://subversion.tigris.org/merge-tracking/func-spec.html
but my understanding is incomplete.
1) The F-Spec:
'Merge info is not taken into consideration for three-way merges,
merge operations which do not specify identical "from" and "to" URLs'
But this is the recommended practice for merging a complete feature
back to trunk: http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.patterns.feature
Given this, what's the recommended practice for merging a feature back
to trunk in 1.5?
2) Given a 1.4 repository with existing branches which have followed
the svnbook recommended practice for tracking merges manually:
http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.wholebr
Will the migration to 1.5 (or a dump/load cycle) reconstruct mergeinfo
such that we can forgo this practice on existing branches going
forward? Or, must we stick to the manual method for those branches,
and count on merge tracking only for branches created post
migration-to-1.5?
Thanks for any help!
Kylo
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 26 20:17:46 2007