After a recent Subversion upgrade from 1.3 to 1.6, I've created a
maintenance branch for a release, which is a copy of trunk. One or two
developers have back-ported some subsequent bug fixes on trunk to this
feature branch. They did this using the Merge feature in TortoiseSVN,
and when committing the changes, rather than committing all of the
changes, they only committed the changes to the source files they
expected to be changed by the merge. They didn't commit the dozens of
other files and folders that only had property changes, to
svn:mergeinfo. This now gives rise to two questions:
1. Why were there so many changes to the svn:mergeinfo property on
apparently unrelated files?
2. What are my options for fixing this so that I'll be able to
automatically reintegrate changes on the maintenance branch back to
trunk? I've tried to do this already, and the reintegration fails with
the message 'Reintegration can only be used if revisions <xxxx> through
<yyyy> were previously merged from <trunk> to the reintegrate source,
but this is not the case: (revision numbers and URLs deliberately
omitted).
Regards,
Chris
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2368320
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-06 11:54:39 CEST