Add a migration step

Author: Oren Novotny

src/GitVersionCore.Tests/ConfigProviderTests.cs

@@ -24,7 +24,7 @@ public void Setup()
     }
 
     [Test]
-    public void CanReadDocument()
+    public void CanReadDocumentAndMigrate()
     {
         const string text = @"
 assembly-versioning-scheme: MajorMinor
@@ -46,10 +46,10 @@ public void CanReadDocument()
         config.NextVersion.ShouldBe("2.0.0");
         config.TagPrefix.ShouldBe("[vV|version-]");
         config.VersioningMode.ShouldBe(VersioningMode.ContinuousDelivery);
-        config.Branches["develop"].Tag.ShouldBe("dev");
-        config.Branches["release[/-]"].Tag.ShouldBe("rc");
-        config.Branches["release[/-]"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
-        config.Branches["develop"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
+        config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("dev");
+        config.Branches["releases?[/-]"].Tag.ShouldBe("rc");
+        config.Branches["releases?[/-]"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
+        config.Branches["dev(elop)?(ment)?$"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
     }
 
     [Test]

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -1,5 +1,6 @@
 namespace GitVersion
 {
+    using System.Collections.Generic;
     using System.IO;
     using System.Linq;
     using System.Text;
@@ -20,6 +21,8 @@ public static Config Provide(string workingDirectory, IFileSystem fileSystem, bo
 
         public static void ApplyDefaultsTo(Config config)
         {
+            MigrateBranches(config);
+
             config.AssemblyVersioningScheme = config.AssemblyVersioningScheme ?? AssemblyVersioningScheme.MajorMinorPatch;
             config.TagPrefix = config.TagPrefix ?? DefaultTagPrefix;
             config.VersioningMode = config.VersioningMode ?? VersioningMode.ContinuousDelivery;
@@ -53,6 +56,33 @@ public static void ApplyDefaultsTo(Config config)
             }
         }
 
+        static void MigrateBranches(Config config)
+        {
+            // Map of current names and previous names
+            var dict = new Dictionary<string, string[]>
+            {
+                { "hotfix(es)?[/-]", new []{"hotfix[/-]"}},
+                { "features?[/-]", new []{"feature[/-]"}},
+                { "releases?[/-]", new []{"release[/-]"}},
+                { "dev(elop)?(ment)?$", new []{"develop"}}
+            };
+
+            foreach (var mapping in dict)
+            {
+                foreach (var source in mapping.Value)
+                {
+                    if (config.Branches.ContainsKey(source))
+                    {
+                        // found one, rename
+                        var bc = config.Branches[source];
+                        config.Branches.Remove(source);
+                        config.Branches[mapping.Key] = bc; // re-add with new name
+                    }
+                }
+            }
+        }
+
+
         static BranchConfig GetOrCreateBranchDefaults(Config config, string branch)
         {
             if (!config.Branches.ContainsKey(branch))