Thanks Henrique for quick response. I think we will do the same.

Farrukh

Sent from my iPad

On 16-Sep-2010, at 4:26 PM, Henrique Prange <[email protected]> wrote:

> Hi Farrukh,
> 
> On 16/09/2010, at 09:17, Farrukh Ijaz wrote:
> 
>> Hi,
>> 
>> We are using Migrations and we found a situation while using Migrations with 
>> SVN branches:
>> 
>> We create a branch from trunk while it's in version 20.
>> People keep modifying the model in trunk. Thus the version is incremented 
>> let's say 21.
>> In the branch we also modify the model. So, it is also on version 21.
>> Now we want to merge the branch back to the trunk.
>> 
>> What should we do now?
>> 
> 
> Usually we rename the trunk migration to version 22 and copy the branch 
> migration version 21 into trunk.
> 
> Cheers,
> 
> Henrique
> 
> _______________________________________________
> Do not post admin requests to the list. They will be ignored.
> Webobjects-dev mailing list      ([email protected])
> Help/Unsubscribe/Update your Subscription:
> http://lists.apple.com/mailman/options/webobjects-dev/farrukh.ijaz%40fuegodigitalmedia.com
> 
> This email sent to [email protected]
 _______________________________________________
Do not post admin requests to the list. They will be ignored.
Webobjects-dev mailing list      ([email protected])
Help/Unsubscribe/Update your Subscription:
http://lists.apple.com/mailman/options/webobjects-dev/archive%40mail-archive.com

This email sent to [email protected]

Reply via email to