-
1. Re: Branch_2_1
timfox Aug 18, 2010 12:02 PM (in response to clebert.suconic)Can you explain what this branch is for?
-
2. Re: Branch_2_1
clebert.suconic Aug 18, 2010 12:03 PM (in response to timfox)2.1 releases.. it's a requirement for EAP.. they don't want any new features.
-
3. Re: Branch_2_1
timfox Aug 18, 2010 12:18 PM (in response to clebert.suconic)Yes, but why 2.1?
Hardcoding the 2.1 in the name doesn't seem right to me, after all, EAP won't always be based on hq 2.1.
In JBM we called it Branch_Stable.
Also, bear in mind, the new HA features will need to go into EAP too.
-
4. Re: Branch_2_1
clebert.suconic Aug 18, 2010 12:42 PM (in response to timfox)I'm fine with the name...
I was using 2.1, because from what I understand they want to be strict about no new features. (That would include no HA new features.. etc).
-
5. Re: Branch_2_1
clebert.suconic Aug 18, 2010 12:44 PM (in response to timfox)Hardcoding the 2.1 in the name doesn't seem right to me, after all, EAP won't always be based on hq 2.1.
Actually, from what I understood, EAP 5.1 would always be based on 2.1. They would have a 5.2 or something to accept a HQ 2.2. I'm not sure now.
I will keep the name as Branch_Stable, and we decide about the features later.
-
6. Re: Branch_2_1
clebert.suconic Aug 24, 2010 8:50 AM (in response to clebert.suconic)It will be actually Branch_2_1, since this is the requirement by product guys.
-
7. Re: Branch_2_1
clebert.suconic Aug 24, 2010 8:53 AM (in response to clebert.suconic)And the cut point is 2.1.2.
2.1.3 will only contain a journal fix... We can merge the other fixes post 2.1.3.
(I need to deliver 2.1.2 + journal fix only for the EAP).
-
8. Re: Branch_2_1
timfox Aug 24, 2010 8:57 AM (in response to clebert.suconic)OK, we should make sure we keep a record of merges using a merge history wiki page like we did with JBM.
-
9. Re: Branch_2_1
clebert.suconic Aug 24, 2010 9:23 AM (in response to timfox)What about adding a text file to the root of the branch?
MergeActivity.txt
When you get the history at any point, you will have exactly what was done at that revision.