I don't think that there is any difference between the way the plugins do the "move" or "rename", they just move the main folder and all sub directories are not updated. It's a pain in the .... Currently there we have no branch but next time we branch-out something we should keep in mind that trap.
Sebastian 2012/2/7 Maxim Solodovnik <[email protected]> > Hello Sebastian, > > I use Subclipse (*subclipse*.tigris.org <http://subclipse.tigris.org/>) > as Eclipse plugin for SVN. > Same time I might use Subversion to move it, or maybe command line svn > since my current platform is Ubuntu. > > On Tue, Feb 7, 2012 at 18:46, [email protected] <[email protected] > > wrote: > >> Hi Maxim, >> >> just some note: >> The last commit I made did break a possible merge of trees for the moved >> folders (again) >> I had quite a bit to do as you where renaming "openmeetings" to "src" >> (because of Apache RAT) integration. I guess you've done it the proper way >> by using Eclipse > Rename. I did also Eclipse > Move. However somehow the >> Eclipse SVN Client is kind of stupid, it does only move or rename the >> Top-Level folders but not update the sub folders. That way it was >> impossible to merge the branch into the files again and I had to manually >> compare files... >> I am using Subversive as Eclipse plugin, which plugin did you use? >> >> Sebastian >> >> 2012/2/7 <[email protected]> >> >> Author: sebawagner >>> Date: Tue Feb 7 11:37:05 2012 >>> New Revision: 1241432 >>> >>> URL: http://svn.apache.org/viewvc?rev=1241432&view=rev >>> Log: >>> OPENMEETINGS-45 New Audio/Video Components Refactor SWF10 files location >>> to prevent including them in the binary. Eventually it needs more >>> refactoring to enable RAT check on new files. >>> >>> Added: >>> incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/ >>> - copied from r1241421, >>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/ >>> >>> incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx >>> - copied, changed from r1241421, >>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/main.as3.lzx >>> >>> >>> incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx >>> - copied, changed from r1241421, >>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/maindebug.as3.lzx >>> Removed: >>> >>> >>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/main.as3.lzx >>> >>> >>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/maindebug.as3.lzx >>> >>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/ >>> Modified: >>> incubator/openmeetings/trunk/singlewebapp/build.xml >>> >>> Copied: >>> incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx >>> (from r1241421, >>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/main.as3.lzx) >>> URL: >>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx?p2=incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx&p1=incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/main.as3.lzx&r1=1241421&r2=1241432&rev=1241432&view=diff >>> >>> ============================================================================== >>> --- >>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/main.as3.lzx >>> (original) >>> +++ >>> incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx Tue >>> Feb 7 11:37:05 2012 >>> @@ -10,7 +10,7 @@ >>> </when> >>> </switch> >>> >>> - <include href="swf10/testVideoObject.lzx" /> >>> + <include href="testVideoObject.lzx" /> >>> >>> <silverstyle name="componentStyle" basecolor="0xFFFFFF" >>> textcolor="0x000000" /> >>> >>> @@ -30,17 +30,17 @@ >>> >>> <attribute name="videoComp_lc" /> >>> >>> - <include href="swf10/base/" /> >>> + <include href="base/" /> >>> >>> - <include href="swf10/video/" /> >>> + <include href="video/" /> >>> >>> - <include href="swf10/commonVideoViewContentSWF10.lzx" /> >>> + <include href="commonVideoViewContentSWF10.lzx" /> >>> >>> - <include href="swf10/hibAdapter.lzx" /> >>> + <include href="hibAdapter.lzx" /> >>> >>> - <include href="swf10/miniIcons.lzx" /> >>> + <include href="miniIcons.lzx" /> >>> >>> - <include href="swf10/dragHelper.lzx" /> >>> + <include href="dragHelper.lzx" /> >>> >>> <view name="mainComponent" width="${canvas.width}" >>> height="${canvas.height}"> >>> <text id="mainBaseText"> </text> >>> >>> Copied: >>> incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx >>> (from r1241421, >>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/maindebug.as3.lzx) >>> URL: >>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx?p2=incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx&p1=incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/maindebug.as3.lzx&r1=1241421&r2=1241432&rev=1241432&view=diff >>> >>> ============================================================================== >>> --- >>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/maindebug.as3.lzx >>> (original) >>> +++ >>> incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx >>> Tue Feb 7 11:37:05 2012 >>> @@ -12,7 +12,7 @@ >>> >>> <debug fontsize="11" oninit="Debug.showInternalProperties = true" >>> width="40%" y="50%" x="60%" height="50%" /> >>> >>> - <include href="swf10/testVideoObject.lzx" /> >>> + <include href="testVideoObject.lzx" /> >>> >>> <silverstyle name="componentStyle" basecolor="0xFFFFFF" >>> textcolor="0x000000" /> >>> >>> @@ -32,17 +32,17 @@ >>> >>> <attribute name="videoComp_lc" /> >>> >>> - <include href="swf10/base/" /> >>> + <include href="base/" /> >>> >>> - <include href="swf10/video/" /> >>> + <include href="video/" /> >>> >>> - <include href="swf10/commonVideoViewContentSWF10.lzx" /> >>> + <include href="commonVideoViewContentSWF10.lzx" /> >>> >>> - <include href="swf10/hibAdapter.lzx" /> >>> + <include href="hibAdapter.lzx" /> >>> >>> - <include href="swf10/miniIcons.lzx" /> >>> + <include href="miniIcons.lzx" /> >>> >>> - <include href="swf10/dragHelper.lzx" /> >>> + <include href="dragHelper.lzx" /> >>> >>> <view name="mainComponent" width="${canvas.width}" >>> height="${canvas.height}"> >>> <text id="mainBaseText"> </text> >>> >>> Modified: incubator/openmeetings/trunk/singlewebapp/build.xml >>> URL: >>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1241432&r1=1241431&r2=1241432&view=diff >>> >>> ============================================================================== >>> --- incubator/openmeetings/trunk/singlewebapp/build.xml (original) >>> +++ incubator/openmeetings/trunk/singlewebapp/build.xml Tue Feb 7 >>> 11:37:05 2012 >>> @@ -57,7 +57,7 @@ >>> <property name="out.dir.swf" >>> value="${basedir}/${dist.webapps.dir}/" /> >>> <property name="laszlo.home" value="${basedir}/openlaszlo" /> >>> <property name="webcontent.src.dir" value="${basedir}/WebContent" >>> /> >>> - <property name="laszlo.as3.src.dir" >>> value="${webcontent.src.dir}/openmeetings" /> >>> + <property name="laszlo.as3.src.dir" >>> value="${webcontent.src.dir}/swf10" /> >>> <property name="laszlo.src.dir" value="${webcontent.src.dir}/src" >>> /> >>> <property name="laszlo.debug" value="false" /> >>> <property name="laszlo.proxied" value="solo" /> >>> >>> >>> >> >> >> -- >> Sebastian Wagner >> http://www.openmeetings.de >> http://incubator.apache.org/openmeetings/ >> http://www.webbase-design.de >> http://www.wagner-sebastian.com >> [email protected] >> > > > > -- > WBR > Maxim aka solomax > -- Sebastian Wagner http://www.openmeetings.de http://incubator.apache.org/openmeetings/ http://www.webbase-design.de http://www.wagner-sebastian.com [email protected]
