[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Qs re merge tracking in 1.5

From: Kylo Ginsberg <kylo.ginsberg_at_gmail.com>
Date: 2007-09-26 20:17:24 CEST

I've read through the functional spec at:
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:
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

Thanks for any help!

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

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.