Thanks for this but I'm still in the dark as to how to correct the problem.
This will be a problem for everyone trying to merge from trunk into their own branch (unless theres same way to ignore this conflict I don't know about). On Thu, Sep 8, 2011 at 2:40 PM, GSR <[email protected]> wrote: > Hi, > [email protected] (2011-09-08 at 1327.44 +1000): >> This commit deletes mergeinfo on many files where no changes are actually >> made, >> eg: >> >> Property changes on: >> trunk/blender/release/scripts/startup/bl_ui/properties_texture.py >> ___________________________________________________________________ >> Deleted: svn:mergeinfo >> >> >> Anyone know how to avoid this? - also how should we go about adding it back? > > The svn:mergeinfo prop was added to a higher level in the same commit. > It sounds like http://svn.haxx.se/users/archive-2010-03/0571.shtml and > then ignorable. > > GSR > > _______________________________________________ > Bf-committers mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-committers > -- - Campbell _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
