[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39081] branches/soc-2011-salad/: Manually marked all soc-2011-carrot revisions merged to fix invalid svn: mergeinfo property.

Miika Hamalainen miika.hamalainen at kolumbus.fi
Fri Aug 5 21:08:53 CEST 2011


Revision: 39081
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39081
Author:   miikah
Date:     2011-08-05 19:08:52 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Manually marked all soc-2011-carrot revisions merged to fix invalid svn:mergeinfo property.

I had merged only Dynamic Paint related commits from soc-2011-carrot. That messed up merge-info to think carrot branch wasn't properly merged, wile it was only missing trunk commits that were already merged to salad directly from trunk.

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662,39001,39009,39063
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38934
/branches/soc-2011-tomato:36831-39069
/trunk/blender:36834-39050
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39080
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38934
/branches/soc-2011-tomato:36831-39069
/trunk/blender:36834-39050




More information about the Bf-blender-cvs mailing list