Don't show non-merged revisions table after a successful auto-commit

console-helpers · Apr 12, 2024 · f5ca593 · f5ca593
1 parent 52d04d9
commit f5ca593
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ...
 
 ### Fixed
-...
+- The non-merged revision table was shown after a successful auto-commit, when merge conflict was resolved.
 
 ## [0.7.0] - 2024-04-12
 ### Added

diff --git a/src/SVNBuddy/Command/MergeCommand.php b/src/SVNBuddy/Command/MergeCommand.php
@@ -284,7 +284,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
 			if ( $revisions ) {
 				$revisions = array_intersect($revisions, $this->_usableRevisions);
 
-				if ( !$revisions && !$this->performCommit() ) {
+				// Auto-commit instead of failing.
+				if ( !$revisions && $this->performCommit() ) {
+					return;
+				}
+
+				if ( !$revisions ) {
 					throw new CommandException(\sprintf(
 						'Requested revisions are %s',
 						$this->isReverseMerge() ? 'not yet merged' : 'already merged'