Re: A subversion strategy question...
Re: A subversion strategy question...
- Subject: Re: A subversion strategy question...
- From: Tony Romano <email@hidden>
- Date: Mon, 17 May 2010 23:09:58 -0700
The way I would do it is the following.
3.0 in a release branch
3.x into a service branch, this is where you will fix bugs for the current version. As you release new versions, 3.1, 3.2, ..., they are released and put into a release branch then a copy of the latest release becomes the starting point for the next service branch.
4.x is only the new development branch(s).
Now, when you have bug fixes in the 3.x service branch(s), you will need to apply those change set up across the branches. You need to decide it they need to be applied to all of the 3.x, or just the latest or some combination. In addition, the change set may need to be applied to the 4.x branch as well so you don't wind up shipping the bug again. The best way to do this is make sure you file the bug against EACH branch the bug fix needs to be applied, this way you won't forget it.
-Tony
On May 17, 2010, at 10:23 PM, Matthew Weinstein wrote:
> Dear XCode users, patience with an SCM beginner, please.
>
> I'm wondering about the best strategy for branching code. I have been working on version 3.0 of my program for the last half decade and now want to develop version 4.0, but I know bug fixes will be necessary or 3.0 still. I branched the code base and put a copy of the trunk in a branch called 3XX. I've been developing the trunk into 4.0, but I'm not sure this is the best way to go with that (I almost think I should have done the reverse).
>
> Thoughts?
>
> --Matthew
>
>
> Matthew Weinstein
> Associate Professor of Science Education
> Education Program
> U.W. - Tacoma
> 253 692-4787
>
> email@hidden
>
> Campus Box: 358435
> 1900 Commerce Street
> Tacoma, WA 98402-3100
> Office: (253) 692-4787
> FAX: (253) 692-5612
>
>
>
>
> _______________________________________________
> Do not post admin requests to the list. They will be ignored.
> Xcode-users mailing list (email@hidden)
> Help/Unsubscribe/Update your Subscription:
>
> This email sent to email@hidden
>
-Tony
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden