Sorry, my cellphone is getting crazy. what I meant to say (and why I likely hit reply or left the email open there) is:
I noticed a similar problem when trying to merge cucumber into trunk prior to the 2.59 release. Somehow svn-merge (via svn-tortoise) was producing a patch which was changing a lot of those svn:merge property. I didn't want to deal with that so I pretend it never happened. It's good to know is something we can ignore. -- Dalai 2011/9/7 Dalai Felinto <[email protected]> > > > > Campbell Barton <[email protected]> wrote: > > > 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? > _______________________________________________ > 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
