Allow merging of sub-folder inside a working copy

Author: Alexander Obuhovich

src/SVNBuddy/Command/MergeCommand.php

@@ -158,10 +158,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		$wc_path = $this->getWorkingCopyPath();
 
-		if ( $this->repositoryConnector->isWorkingCopy(dirname($wc_path)) ) {
-			throw new \InvalidArgumentException('The "' . $wc_path . '" isn\'t working copy topmost folder.');
-		}
-
 		$this->ensureLatestWorkingCopy($wc_path);
 
 		$source_url = $this->getSourceUrl($wc_path);
@@ -199,7 +195,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 		}
 		elseif ( $this->_unmergedRevisions ) {
 			$this->runOtherCommand('log', array(
-				'path' => $source_url,
+				'path' => $this->repositoryConnector->getProjectUrl($source_url),
 				'--revisions' => implode(',', $this->_unmergedRevisions),
 				'--details' => $this->io->getOption('details'),
 				'--merge-oracle' => true,