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

1.5 merge tracking expectations

From: Blair Zajac <blair_at_orcaware.com>
Date: Wed, 11 Jun 2008 10:03:44 -0700

For our 1.5.0 release notes, we should have a section that lists all the types
of merge operations we expect or know will fail, so people have the proper
expectations, and can choose to remain on 1.4 or upgrade to 1.5 and continue to
use say svnmerge.py.

I'd hate for people to move to 1.5, do a bunch of work in trunk, and then find
out they can't merge that to a branch, for whatever reason or limitations we have.

For people that do a lot of refactoring and renaming, it looks like 1.5 will
have issues, given what we saw with the issue-3000 merge?

Having a very explicit section saying, if you do these commits in the source URL
and try to merge to a destination URL, you will run into issues will be very
helpful. The known limitations section currently just lists an issue with
merging back to trunk with the --reintegrate flag.

Say we release 1.5.0 without some of these issues resolved and fix them in
1.5.1. If somebody does upgrade to 1.5.0, continues to use svnmerge.py to avoid
some of the 1.5.0 issues, then updates to 1.5.1 and finally migrates svnmerge.py
to mergeinfo using svnmerge-migrate-history.py, what will happen? Will the
migration work given that the commits with 1.5.0 generated mergeinfo already?


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-11 19:04:01 CEST

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

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