On Mon, Mar 2, 2009 at 4:41 PM, Guilherme Polo <[email protected]> wrote:
> On Mon, Mar 2, 2009 at 9:42 AM, Adriano Monteiro Marques
> <[email protected]> wrote:
>> Hello,
>>
>> Em 02 Mar 2009, às 12:54, Guilherme Polo escreveu:
>>
>>> On Mon, Mar 2, 2009 at 7:42 AM, Adriano Marques <[email protected]>
>>> wrote:
>>>>
>>>> Hello Guilherme, Folks,
>>>>
>>>>> What about creating a scripts directory (or some better name maybe)
>>>>> and put umit and umit_scheduler.py there ?
>>>>
>>>> The bin option you suggested sounds ok. We shall not forget to adapt
>>>> the installation scripts, and if possible, leave everything capable of
>>>> working out-of-the-box, or just-after-extracting-source-package
>>>> because sometime it is nice to don't need to install it.
>>>>
>>>
>>> I've taken care of making it capable to work
>>> just-after-extracting-source-package, so this sounds good to go.
>>> I will be doing the restructure tonight I think, I'm moving to a new
>>> house so I might do it only tomorrow.
>>>
>>> Regards,
>>
>> Great, Guilherme!
>> Thanks for that! Take your time for the moving. Wish you good luck in your
>> new house ;-)
>>
>
> Thanks :)
>
> The restructure is done now.
>
> Now for those using svnmerge please read this. The restructure had to
> be done in two parts (actually three, but the second and third part
> could have been done together) because umit was a file and now it is a
> directory, you can't remove a file and add a directory with the same
> name in the same commit using svn. So when merging you will have to do
> the same thing, merge the first part then commit and only commit merge
> the other parts.

That was supposed to be:
"merge the first part then commit and only then merge the other parts."

> Resuming, you will need to do two merges in order to
> move to the new structure:
>
> svnmerge merge -r4239
> svnmerge merge -r4240-4247
>
> I also had another problem using svnmerge. Although I'm not totally
> sure if I did something wrong, or not, during the first merge (r4239)
> what happened was that the umit and umit_scheduler.py files didn't get
> scheduled for addition in bin/, they were just left there. I rolled
> back the merge and merged again but this time using the trunk version
> of svnmerge.py, which is said to be the best available version, you
> can get it at 
> http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge/svnmerge.py
>
> The second svnmerge command is running as I email this, but I expect
> to have no problems with it (and I'm actually running just svnmerge
> merge to merge some other things).
>
>>
>> Cheers!
>>
>> ---
>> Adriano Monteiro Marques
>>
>> http://www.thoughtspad.com
>> http://www.umitproject.org
>> http://blog.umitproject.org
>> http://www.pythonbenelux.org
>>
>> "Don't stay in bed, unless you can make money in bed." - George Burns
>>
>>
>
>
>
> --
> -- Guilherme H. Polo Goncalves
>



-- 
-- Guilherme H. Polo Goncalves

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Umit-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/umit-devel

Reply via email to