Merge pull request #183 from ajoberstar/parallel

Only use parallel version avoidance for significants
ajoberstar · Aug 19, 2022 · 08be355 · 08be355
2 parents 0c85609 + eba7a4c
commit 08be355
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/reckon-core/src/main/java/org/ajoberstar/reckon/core/Reckoner.java b/reckon-core/src/main/java/org/ajoberstar/reckon/core/Reckoner.java
@@ -92,9 +92,10 @@ private Version reckonNormal(VcsInventory inventory) {
  }
 
  var targetNormal = inventory.getBaseNormal().incrementNormal(scope);
+ var probableStage = stageCalc.calculate(inventory, targetNormal);
 
  // if a version's already being developed on a parallel branch we'll skip it
- if (inventory.getParallelNormals().contains(targetNormal)) {
+ if (inventory.getParallelNormals().contains(targetNormal) && probableStage.isPresent()) {
  if (scope.compareTo(parallelBranchScope) < 0) {
  logger.debug("Skipping {} as it's being developed on a parallel branch. While {} was requested, parallel branches claim a {}, using that instead.", scope, parallelBranchScope);
  targetNormal = targetNormal.incrementNormal(parallelBranchScope);