vsarbranchingguide Issue Tracker Rss Feed

Commented Issue: No Source Code [17895]

mfreidge — Tue, 02 Oct 2012 20:39:28 GMT

Since this is a CodePlex project you should make the raw Word and image documents available so that we can modify them to fit the needs of our separate teams. 
 
For example, if my company is using the advanced branching plan, then I would want to remove the basic and standard plans from the documents I give them. Likewise, I would want to add my own section on version numbers that apply specifically to my project..

Comments: ** Comment from web user: mfreidge **

Please consider to create document templates, that different teams can use to describe their own branching plans.

Commented Issue: No Source Code [17895]

wheys — Tue, 17 Jul 2012 21:22:54 GMT

Since this is a CodePlex project you should make the raw Word and image documents available so that we can modify them to fit the needs of our separate teams.

For example, if my company is using the advanced branching plan, then I would want to remove the basic and standard plans from the documents I give them. Likewise, I would want to add my own section on version numbers that apply specifically to my project..
Comments: ** Comment from web user: wheys **

The ranger team does not generally release the original word documents. We have had copyright issues in the past, where people will modify "our documents" and release them with modifications we do not and cannot approve. Often the changed documents do not give appropriate copyright credit to the Ranger team (a violation of the agreement you consent to when you download from Codeplex)

Created Issue: NuGet for shared resources [18090]

rosieks — Sun, 20 May 2012 09:57:07 GMT

Could you describe how to use NuGet for managing shared resources in TFS.

Created Issue: No Source Code [17895]

Grauenwolf — Sat, 21 Apr 2012 00:27:20 GMT

Created Issue: Error in Advanced Plan Diagram [17892]

Grauenwolf — Fri, 20 Apr 2012 21:47:23 GMT

This diagram on page 45 shows the hotfix being created in the read-only release branch, not the hotfix branch.

Commented Issue: TFS Branching Guide - Scenarios 2.0 - Missing Content [13957]

DaveComfort — Fri, 13 Aug 2010 12:48:15 GMT

On page 11, there are Branch definitions for 'Production' and 'VNext' but these definitions are not shown in Figure 8. In the scenario walkthrough on page 13, it would be very useful to understand how the reverse integrations from 'Dev' and 'Dev-1' are handled in Main (specifically when it comes time to release 'Dev' to Production and Main contains changes from 'Dev' and 'Dev-1', what is your strategy to only release 'Dev' changes and not 'Dev-1' changes... Are you using Labels?).
Comments: ** Comment from web user: DaveComfort **

Bill,
Thanks for the reply. I agree with your merging approach from the development branches back to Main. The dev teams will need to spend time to make sure the forward integrations from Main do not destabilize 'their' branch (this should be taken care of if the team has created tests to verify their branch). As far as labels go it seems to make sense to label the Main branch each time the software is released to Production. This provides a convenient marker for future branches.
Dave Comfort

Commented Issue: TFS Branching Guide - Scenarios 2.0 - Typo [12670]

wheys — Thu, 12 Aug 2010 20:52:06 GMT

Hi,

in the file [TFS Branching Guide - Scenarios 2.0.pdf] in page 9 the following text

"Dev - child branches of main where developers work on the current on future versions on the product."

i think has an error and must be

"Dev - child branches of main where developers work on the current or future versions on the product."

Regards
Comments: ** Comment from web user: wheys **

Thanks for adding this issue.
I will be working on refreshing the guidance soon.
The scenarios document will be one of my main focus areas.
Regards,
Bill Heys
VS ALM Ranger

Commented Issue: TFS Branching Guide - Scenarios 2.0 - Missing Content [13957]

wheys — Thu, 12 Aug 2010 20:50:15 GMT

Dave,
One of my goals for the next release of the guidance is to clean up some of the inconsistencies in our various documents. I appreciate your input to this.
During the development of the original Rangers Branching Guidance II, many people were contributing to this effort. As a result, some of the scenario approaches are somewhat different from the main guidance. These differences are sometimes minor, but also sometimes annoying (to me). I want to rewrite the scenarios so these discrepancies are resolved (or less evident)

With respect to you question of Dev, Dev-1, and Main. I have the following suggestion. Look for this to be a scenario in the next release!
Our guidance is generally to have feature team branches (Dev, Dev-1) be full children of Main. My question would be, whey would both Dev and Dev-1 be merged (RI) to Main if they are not being released together? If Dev is being released, but Dev-1 is in a future release why not merge (RI) just Dev to Main until it is released. Following this, the next time Main is merged (FI) to Dev-1 the Dev feature and Dev-1 features will be integrated in the Dev-1 branch only (not in Dev or Main).
Later, when Dev-1 is ready for release, it can me merged (RI) to Main, stabilized, and then released.
With respect to labels, I tend to use branches rather than labels to provide isolation. Labels are a useful way of *tagging* a branch as of a point in time or at the point of a milestone. I am not sure how the label helps to keep Dev and Dev-1 separate (isolated).
Does this satisfy your needs?
Regards,
Bill Heys
VS ALM Ranger

Created Issue: TFS Branching Guide - Scenarios 2.0 - Missing Content [13957]

DaveComfort — Tue, 10 Aug 2010 16:01:04 GMT

Created Issue: TFS Branching Guide - Scenarios 2.0 - Typo [12670]

elbruno — Tue, 13 Apr 2010 16:37:15 GMT

Created Issue: Branching Guide - Typos and Corrections suggested [12350]

wheys — Mon, 29 Mar 2010 15:39:00 GMT

1. In the main document, page 1, the old guide (v2) is referenced:

2. Main document, page 24, talks about TFS "basic edition", which should be: TFS basic installation wizard.
3. The "Track Changeset" screenshots look like a recommendation to check-in changes to MAIN first and then merge over to all other child branches. I would expect them to start in Development (95) and then merge to Main and then to Release.

Created Issue: Branching Guidance Main Document - Type [12349]

wheys — Mon, 29 Mar 2010 15:35:44 GMT

I read this out of the 2010 Branching Guidance.

Please post your scenarios not covered below to the community section associated with this document at http://www.codeplex.com/TFSBranchingGuideII .

Should it be http://www.codeplex.com/TFSBranchingGuideIII
Submitted directly to Willy-Peter Schaub

Created Issue: Quick Start - Basic Branch Plan HOL question [12348]

wheys — Mon, 29 Mar 2010 15:34:15 GMT

I am looking at page 11 of file HOL_Quick_Start_Basic_Branch_Plan_2010_v1.pdf of Branching and Merging Guidance for 2010.

It is section Scenario #2: Concurrent Hotfix, Service Pack, and vNext, Figure 8. Concurrent Hotfix, Service Pack, and vNext.

I think the figure is missing Reverse Integration steps both from Dev to Main, and from RTM->HF->SP->Main.

Second one is even mentioned at page 17: “Changes should be merged (RI) in from RTM->HF->SP->Main only.”

Issue submitted directly to Willy-Peter Schaub

Created Issue: Branching Poster Scenarios and the Branching Scenarios document don't align [12347]

wheys — Mon, 29 Mar 2010 15:32:50 GMT

In TFS_Branching_Guide_Scenarios_2010_Poster_v1.vsd I can see there are 4 scenarios under tab Scenarios.
The forth one is being called – Team, Feature, Release Isolation Branching Model.

However I cannot find this scenario in TFS_Branching_Guide_Scenarios_2010_v1.pdf. Only the first three are included in the pdf.

Do you plan to add this forth one to the pdf? I think it will be very valuable.

Issue submitted directly to Willy-Peter Schaub

Created Issue: Branch By Label - Q&A [12346]

wheys — Mon, 29 Mar 2010 15:31:27 GMT

Page 10 in doc TFS_Branching_Guide_Q&A_2010_v1.pdf is talking about Branch by Label. This feature is available only in command line, and not in the UI.

I think this is important to be rephrased.
Note - Submitted directly to Willy-Peter Schaub