[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39991] trunk/blender: Merging r39693 through r39989 from vgroup_modifiers branch into trunk.

[Dalai Felinto]

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 <dfelinto at gmail.com>

>
>
>
> Campbell Barton <ideasman42 at gmail.com> 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
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>
>