RE: merge is silently changing svn:mergeinfo on unrelated files

2010-02-19 Thread Bob Archer
> I have two branches, release and patches. Release was made in rev 2120 > by copying HEAD of trunk. Patches was made in rev 2138 by copying HEAD > of release -- release had no changes between 2120 and 2138. Now I'm > merging changes from trunk into patches, with the intent of vetting > these and b

merge is silently changing svn:mergeinfo on unrelated files

2010-02-19 Thread Chris Jones
I have two branches, release and patches. Release was made in rev 2120 by copying HEAD of trunk. Patches was made in rev 2138 by copying HEAD of release -- release had no changes between 2120 and 2138. Now I'm merging changes from trunk into patches, with the intent of vetting these and bringin