Changed properties are just that, changed properties. Change them back and there is no problem. I've now synced them up so there is no difference in properties except the root svn:mergeinfo, which should differ.
The differences were all empty svn:mergeinfo from trunk that I deleted from soc-2010-jwilkins when I was trying to get mergeinfo in that branch correct so that the new merge command work properly. I'm pretty sure empty mergeinfo doesn't make a difference either way, and that somebody who is responsible for that could remove the empty mergeinfo tags from trunk because they just clutter things up. 2011/5/30 Ρυακιωτάκης Αντώνης <[email protected]>: > Hello everyone, my recent work on float textures can be found here > > http://codereview.appspot.com/4560052/ > > Since Jason Wilkins' work is merged to onion I may have to work in trunk if > this is going to be merged soon. > I am getting many lines about changed properties in the diff output. Should > that worry me? > _______________________________________________ > Bf-committers mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-committers > _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
