Hallo German, there are several options you could try to get your branch in the SVN:
I see from your ZIP you still have the SVN files/connection to the SVN in your project. I guess those ones are from our googlecode project SVN? So you could simply do a synchronize ? Then you have possible conflicts in front of view? I understand that there could be potentially conflicts then but actually maybe there is not even something critical ? When merging is done (maybe you make a backup at this point) you right click on project and then from the SVN menu you try to create a branch based on that. The other way round if you right click on the project in clipse > team >create patch ... I guess you've done something like that. But which files from the ZIP that you additionally provided are NOT in your diff ?! Actually your DIFF: What is this DIFF ?! DIFF between r4270 and your changes or DIFF between your changes and trunk ? Actually this work should happen in a branch not in trunk, we can merge that branch later easily into (when you really create a branch and not commit everything from scratch). There is also an option in the SVN plugin where you can directly compare your current project with a random revision and I think you can then export the diff a patch. Your SVN passwords and users I cannot tell you, there are in your user profile, login to code.google.com and visit those pages: https://code.google.com/hosting/settings http://code.google.com/p/openmeetings/source/checkout Merging those changes will be one thing but afterwards fixing and testing everything will be a next thing. So I would like to commit those changes into a branch and not into trunk. Do you feel like beeing able to deal with that? Otherwise you should make a ZIP with the hole eclipse project including the svn entries and forward that to me and I will try to do the same. Sebastian 2011/11/8 German Grekhov <[email protected]> > Our implementation doesn't require any pre-builds. It could be compiled > just in a single ANT task. > > So, what about your offerings... It is not so clear for me how your > offerings resolve the problem of the race between the merging process and > commits of other developers into the trunk version. But if not only me will > work with merging, so yes, it is a good solution. > > And what about checkin to the brunch? What do you want more? Do you want > me to checkin the initial version of our work (modified revision 4207) or > to checkin some current merging version, that I have already sent you? I > think that the second variant is better. > > So, what is my login and password for the subversion? :) > > German. > > 2011/11/8 [email protected] <[email protected]> > > I cc'ed Timur, so we can discuss the process to get this into trunk >> together. >> We should also move this discussion to dev-mailing list ... >> >> Does your implementation require any external pre-build SWFs with Adobe >> Flex or Adobe Flash? This is no blocker to get this into the trunk but of >> course it would be better if we can compile everything from source in a >> single ANT task. As OpenLaszlo contains even the Flex SDK I think we should >> be able to compile also those ones natively somehow. But if its only a >> plain precompiled SWF with a video-component inside it would be okay too at >> this point. >> >> However: Instead of relying on me to merging your code without knowing >> where to look at we could be moving forward much faster this way: >> If you could make a new branch in the SVN based on trunk, you could >> commit into that one all your changes together with Timur. >> I have set you and Timur up in OpenMeetings goolgecode website with >> commit privileges for the SVN using your gmail accounts. >> >> As soon as your changes are in the SVN, I will checkout that branch, we >> will fix it together and then merge it into trunk. That way we keep trunk >> clean and we can merge a working version into it when we decide that its >> ready. >> >> What do you think? >> You and Timur have the time to create the branch and checkin your code? >> >> Thanks, >> >> Sebastian >> >> 2011/11/8 German Grekhov <[email protected]> >> >>> Sebastian, here is the description of produced changes. This description >>> is written by Timur Tleukenov. He is the developer of the separate video >>> compenent. >>> >>> ------------------------ >>> Code responsible for displaying and transmission of video\audio has been >>> moved to a separate SWF10-application and ported to Action Script 3. >>> Patch makes no visual changes, so that the screenshot does not help to >>> show changes. >>> >>> The patched application has the following architecture: >>> >>> - To SWF10 application with the video component loads main SWF8 >>> application as sprite. >>> - Applications communicates between them via LocalConnection. >>> - To send audio\video uses additional RTMP-connection from the video >>> component. >>> - Windows with video appears over main application. >>> >>> Files responsible for audio\video were copied to the video component >>> (editRecordStream, baseVideoObject, videoObjectBroadcast \ PlayBroadcast \ >>> .. and it's dependencies from WebContent/openmeetings/base) and ported to >>> AS3. >>> In the main application it's methods is replaced by a call to the video >>> component via LocalConnection. >>> ------------------------ >>> >>> I have sent you the patch with the changes (video.patch). >>> Also the file "swf10.zip" must be unpacked and the folder "swf10" from >>> it must be placed to %OM_DIR/%/WebContent/openmeetings/ >>> >>> The decription is also attached to the letter (changes.txt). >>> >>> Thakns, >>> German Grekhov. >>> >>> >>> 2011/11/8 [email protected] <[email protected]> >>> >>> Hi German, >>>> >>>> you can send me the patch and I will test and comment or commit it >>>> directly. >>>> >>>> Can you give me an overview of the functional changes that you've done. >>>> What do you mean in terms of separation? >>>> >>>> I guess I will see it by myself when I do test your changes, but it is >>>> often a different view if you could give me some documentation on what you >>>> have done. >>>> For example you could make a screenshot of the application and then >>>> describe with some lines/bubbles what the funcationality / buttons / >>>> sensitives areas are on the screen. Similar to this one: >>>> http://www.openmeetings.de/images/room_layout_orig.png (But some more >>>> detailed would be good). >>>> >>>> We could use this screenshot then as reference and for documentation. >>>> >>>> Thanks >>>> Sebastian >>>> >>>> >>>> 2011/11/8 German Grekhov <[email protected]> >>>> >>>>> Hello, Sebastian. >>>>> >>>>> At present our team at UniPro has done a task of isolating video in >>>>> OpenMeetings to the separate video component. So we have another >>>>> OpenMeetings version and this version works good. But this version is a >>>>> modified brunch of the trunk version with the revision 4207. >>>>> >>>>> When I had started merging our version with trunk version, the trunk >>>>> had the revision 4507. So the differences are contained by 300 revisions. >>>>> So it is very hard to merge these versions fastly. >>>>> >>>>> I have been working with merging for a week and current revision of >>>>> the trunk is already 4522. >>>>> So the speed of trunk changing is faster than my work. An it is a >>>>> problem because it provides unlimited working with merging with new and >>>>> new >>>>> changes of the trunk. >>>>> >>>>> Sebastian, what do you think about commiting the ustable and not >>>>> well-tested version with our changes to the trunk? It brakes some things >>>>> but it stops my race with anorther commiters. And then I would fix >>>>> existing >>>>> bugs. >>>>> >>>>> The separated video component is a good refactoring of OpenMeetings >>>>> code and it would make the system better. We don't want to loose our >>>>> produced work, so we need your help. >>>>> >>>>> There are three bug that we know: >>>>> 1) A problem with resising of video windows (aspect ratio is not >>>>> saved). >>>>> 2) Your buttons with swithing on/off microphones don't work. >>>>> 3) Incorrenct indication of user's permission of having video. >>>>> >>>>> If you agree with it, I will send you the patch with current changes. >>>>> >>>>> Best regards, >>>>> German Grekhov. >>>>> >>>>> >>>> >>>> >>>> -- >>>> Sebastian Wagner >>>> http://www.openmeetings.de >>>> http://www.webbase-design.de >>>> http://www.wagner-sebastian.com >>>> [email protected] >>>> >>> >>> >> >> >> -- >> Sebastian Wagner >> http://www.openmeetings.de >> http://www.webbase-design.de >> http://www.wagner-sebastian.com >> [email protected] >> > > -- Sebastian Wagner http://www.openmeetings.de http://www.webbase-design.de http://www.wagner-sebastian.com [email protected] -- You received this message because you are subscribed to the Google Groups "OpenMeetings developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/openmeetings-dev?hl=en.
