It appears Jim dealt with this. Should I update 2304 and 2379 to reflect that they are fixed in PR3 also, or did you do that?
On 2006-07-31, at 16:46 EDT, Max Carlson wrote: > > > P T Withington wrote: >> On 2006-07-31, at 16:00 EDT, Max Carlson wrote: >>> In legals-pr2, Tucker has renamed et -> lzpix. For some reason, >>> this is preventing a clean merge from legals trunk. >>> >>> > svn merge -r 1394:1395 http://svn.openlaszlo.org/openlaszlo/ >>> branches/legals >>> U WEB-INF/lps/lfc/kernel/dhtml/LzInputTextSprite.js >>> Skipped missing target: 'demos/et/classes/search.lzx' >>> Skipped missing target: 'demos/et/classes' >>> Skipped missing target: 'demos/et' >>> >>> Am I doing something wrong? I seems like svn shoudl be able to >>> handle this if et was 'moved' to 'lzpix', no? >> Probably I did something wrong in the first place. I did an svn >> mv, but when I tried to commit, I got a similar error, so I >> undeleted et/ and did the delete of et/ as a later step. I must >> have confused svn. >> If you want, I can just make a parallel change in trunk. >> Or maybe the svn guru's have a suggestion? > > Since we haven't heard from the gurus, I propose you go ahead and > mirror the change in trunk. > > -Max _______________________________________________ Laszlo-dev mailing list [email protected] http://www.openlaszlo.org/mailman/listinfo/laszlo-dev
