On Thu, Jun 09, 2011 at 02:51:47PM +0100, Echlin, Jamie wrote: > > Hmmm... > > Does the parent of the offending directory have > > non-inheritable mergeinfo? > > (Mergeinfo entries that have an asterisk appended are not > > inheritable.) > > Hi Stefan... > > Before the merge only the source (/trunk) and target > (branches/topic-XYZ) have mergeinfo, not parents or sub-directories of > either. > > The source and target both have two rev ranges for a single branch with > an asterisk, but this is for a completely unrelated branch...
It would be interesting to see if you can reproduce the problem in your environment with the 1.7.0-alpha1 release. This release should become available during the next few days. Once it is available, could you try to repeat the merge with a 1.7.0-alpha1 client into a working copy of the appropriate old revision? If you can reproduce it with 1.7, and have the time, could you try to come up with a reproduction recipe that produces the problem, starting from an empty repository? Maybe you've found a bug in processing of non-inheritable mergeinfo. Having an isolated test case for this problem would help a lot. If you don't have time for all that, that's fine. Someone might eventually try to reproduce this problem based on information you've already provided and write a script or regression test. In any case, I think we should file an issue to keep track of this.
