mergeinfo not inherrited when I thought it should
From: Pieter-Jan Busschaert <pieterjan.busschaert_at_gmail.com>
Date: Fri, 29 Oct 2010 16:45:36 +0200
In a quick test, we have a project which has the following structure:
Next, we create a branch from /trunk/project to
We edit file on trunk a first time, changing line1 and commit
Inside branch1, we do a merge from trunk. This creates mergeinfo on
We edit file on trunk a second time, reverting line1, changing line2 and commit
Inside branch1/subfolder, we do a merge from trunk/subfolder.
This last step ignores the mergeinfo on /branches/project/branch1/ and
The result is that we merge the combination of the 2 edits, which is
See attachment for a reproduction scenario.
Is this scenario supposed to be handled by SVN ?
This is an archived mail posted to the Subversion Users mailing list.