> > Hello, > > In a quick test, we have a project which has the following structure: > > /trunk/project/subfolder/file > > Next, we create a branch from /trunk/project to > > /branches/project/branch1/ > > We edit file on trunk a first time, changing line1 and commit > > Inside branch1, we do a merge from trunk. This creates mergeinfo on > /branches/project/branch1 > > We edit file on trunk a second time, reverting line1, > changing line2 and commit > > Inside branch1/subfolder, we do a merge from trunk/subfolder.
Do you mean trunk/project/subfolder here? Anyway, branch1/subfolder does not have any mergeinfo, since the previous merge was done on branch1. So Subversion does not know that you have already merged the changes to line 1. Merges from trunk to branch and vice-versa should always be done from the root of the project (in your case branches/project/branch1) > > This last step ignores the mergeinfo on > /branches/project/branch1/ and merges all revisions again > since we made the branch. I thought inherrited mergeinfo > would be used here to see that a first part of the revision > range did not need to be merged again. However, this does not happen. > > The result is that we merge the combination of the 2 edits, > which is only changing line2. > However, we had already merged the change to line1, so the revert on > line1 should have been merged too. > > See attachment for a reproduction scenario. > > Is this scenario supposed to be handled by SVN ? > We are in a corporate environment, using 1.5.1. Is the above > scenario known to be handled correctly in later versions? I don't think so, as I think Subversion did the correct thing, given the information it has. However, I recommend you to push for an upgrade of SVN, as I remember 1.5 was not particularly good with merging. > Is it a known issue? > Do I try something which is not supported by SVN? > > > Kind regards, > > Pieter-Jan Busschaert > Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
