Thanks Guilherme.
Now works.
Restructure is a nice work dude.
On Wed, Mar 4, 2009 at 2:14 PM, Luis A. Bastiao Silva <[email protected]>wrote:
>
>
> On Wed, Mar 4, 2009 at 2:11 PM, Guilherme Polo <[email protected]> wrote:
>
>> On Wed, Mar 4, 2009 at 11:06 AM, Guilherme Polo <[email protected]> wrote:
>> > On Wed, Mar 4, 2009 at 10:55 AM, Luis A. Bastiao Silva
>> > <[email protected]> wrote:
>> >> Hi,
>> >>
>> >> I have serveral problems merging my branch.
>> >
>> > Luis,
>> >
>> > From the logs I have seen you didn't even merge the commits that
>> > restructured umit, you have a problem somewhere else.
>> >
>>
>> Now I see you did something wrong at some point.
>>
>> How did you manage to do the commits 4172 and 4254 with the same
>> commit message ?
>
>
> Something wrong was happen..
>
>
>>
>>
>> >> So could I update it from trunk by hand and just block these commits at
>> >> /trunk?
>> >>
>> >
>> > Please, don't change any svnmerge properties on trunk. Also, I don't
>> > know what you mean by hand (maybe svn merge?), but it doesn't make
>> > much difference actually. The problem is not related to svnmerge, it
>> > is just how svn works. There was a file named umit, now it is a
>> > directory, so you first merge the commit that did this change, then
>> > you do the other merges.
>> >
>> > If you have older things to merge, then merge those before anything.
>> >
>> >
>> > --
>> > -- Guilherme H. Polo Goncalves
>> >
>>
>>
>>
>> --
>> -- Guilherme H. Polo Goncalves
>>
>
>
>
> --
> Luís A. Bastião Silva
>
>
--
Luís A. Bastião Silva
------------------------------------------------------------------------------
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
