Re: Migrations and SVN branches
Re: Migrations and SVN branches
- Subject: Re: Migrations and SVN branches
- From: Henrique Prange <email@hidden>
- Date: Thu, 16 Sep 2010 10:26:34 -0300
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@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden