A more careful look and found out that the properties were svn:merge-info updates. I guess I do not need to reverse merge this stuff.
On Fri, Aug 13, 2010 at 2:50 PM, Karan Malhi <[email protected]> wrote: > I committed a change to the jcdi branch today where I updated the version > of surefire-plugin to 2.5. This affected a few pom.xml files. I then wanted > to merge the change to the trunk, so I found out the latest two revisions of > jcdi . Mine was 985270 and dblevins had committed version 984658 . > So in order to merge my changes, I switched to my trunk and did svn merge > -r 984658:985270 > https://svn.apache.org/repos/asf/openejb/branches/openejb-jcdi > > I was expecting only my pom.xml files would be merged, but later realized > that some [props changed] entries in the commit. I have not done much > merging with subversion before , so cannot see what I did wrong and why > would those extra [props changed] entries be merged too. > > The revision where I committed in the trunk is 985312. How do I revert the > stuff which I did not intend to merge. With files I could probably reverse > merge, not sure how to do with property changes. > > -- > Karan Singh Malhi > -- Karan Singh Malhi
