[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender  trunk/blender: Merging r39693 through r39989 from vgroup_modifiers branch into trunk.
ideasman42 at gmail.com
Thu Sep 8 06:52:55 CEST 2011
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 <gsr.b3d at infernal-iceberg.com> wrote:
> ideasman42 at gmail.com (2011-09-08 at 1327.44 +1000):
>> This commit deletes mergeinfo on many files where no changes are actually made,
>> Property changes on:
>> 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.
> Bf-committers mailing list
> Bf-committers at blender.org
More information about the Bf-committers