public function testGetFreshMergedRevisionsWithChanges() { $this->_expectCommand("svn --non-interactive propget svn:mergeinfo '/path/to/working-copy' --revision BASE", '/projects/project-name/trunk:10,15' . PHP_EOL); $this->_expectCommand("svn --non-interactive propget svn:mergeinfo '/path/to/working-copy'", '/projects/project-name/trunk:10,15,18,33' . PHP_EOL . '/projects/project-name/branches/branch-name:4' . PHP_EOL); $this->_revisionListParser->expandRanges(Argument::cetera())->willReturnArgument(0); $this->assertSame(array('/projects/project-name/trunk' => array('18', '33'), '/projects/project-name/branches/branch-name' => array('4')), $this->_repositoryConnector->getFreshMergedRevisions('/path/to/working-copy')); }