Merge branch 'master' of https://github.com/scm4j/scm4j-releaser

# Conflicts:
#	src/main/java/org/scm4j/releaser/ActionTreeBuilder.java
#	src/main/java/org/scm4j/releaser/scmactions/SCMActionTag.java
#	src/test/java/org/scm4j/releaser/WorkflowDelayedTagTest.java
#	src/test/java/org/scm4j/releaser/WorkflowForkTest.java
#	src/test/java/org/scm4j/releaser/WorkflowTestBase.java

Author: host6

src/main/java/org/scm4j/releaser/scmactions/SCMActionTag.java

@@ -52,7 +52,7 @@ private void bumpPatch(IProgress progress, IVCS vcs, Version delayedTagVersion)
 	}
 
 	private Version tagRevision(IProgress progress, IVCS vcs, String revisionToTag) {
-		Version delayedTagVersion = new Version(vcs.getFileContent(null, Utils.VER_FILE_NAME, revisionToTag));
+		Version delayedTagVersion = new Version(vcs.getFileContent(releaseBranchName, Utils.VER_FILE_NAME, revisionToTag));
 		TagDesc tagDesc = Utils.getTagDesc(delayedTagVersion.toString());
 		try {
 			Utils.reportDuration(() -> vcs.createTag(releaseBranchName, tagDesc.getName(), tagDesc.getMessage(), revisionToTag),

src/test/java/org/scm4j/releaser/WorkflowDelayedTagTest.java

@@ -1,15 +1,5 @@
 package org.scm4j.releaser;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.List;
-import java.util.Map;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -32,6 +22,11 @@
 import org.scm4j.vcs.api.VCSTag;
 import org.scm4j.vcs.api.WalkDirection;
 
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
 public class WorkflowDelayedTagTest extends WorkflowTestBase {
 
 	private final DelayedTagsFile dtf = new DelayedTagsFile();