diff -r 0af3c8c7609b -r 43a79540b862 extensions.st --- a/extensions.st Wed Apr 11 19:15:07 2012 +0200 +++ b/extensions.st Fri Apr 13 20:11:15 2012 +0200 @@ -129,7 +129,7 @@ labelA: 'Working copy'; labelB: ('r %1' bindWith: rev printString); textA: wcfile contents asString; - textB: revfile contents asString; + textB: revfile asString; title:('%1: Diffbetween working copy and rev. %2 ' bindWith: wcfile asFilename baseName with: rev printString); open @@ -195,7 +195,7 @@ objects := givenObjects. - self class == FileBrowserV2 ifTrue:[ + (self isKindOf: FileBrowserV2) ifTrue:[ workdir := self fileEntryFieldHolder value asFilename. workdir isDirectory ifFalse:[ workdir := workdir directory @@ -371,12 +371,12 @@ svnMergeBranch | branch | - branch := Dialog request: 'Enter URL of SVN branch to merge:'. + branch := Dialog request: 'Enter URL of SVN branch to merge:' initialAnswer:'^/trunk'. branch notEmptyOrNil ifTrue:[ self svnExecuteCommand: 'merge ',branch objects: #() ]. - "Modified: / 21-03-2012 / 11:01:04 / Jan Vrany " + "Modified: / 13-04-2012 / 13:41:11 / Jan Vrany " ! ! !AbstractFileBrowser methodsFor:'menu actions-scm-svn'!