diff --git a/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st b/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st index eb8c6e8fc4..0c9f1cc626 100644 --- a/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st +++ b/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st @@ -55,12 +55,6 @@ IceAttachedSingleVersionWorkingCopy >> mergeCommit: mergeCommit [ execute. ] -{ #category : #merging } -IceAttachedSingleVersionWorkingCopy >> mergeStateWith: aMergeableState [ - - ^ aMergeableState mergeWithSingleVersionWorkingCopyState: self -] - { #category : #accessing } IceAttachedSingleVersionWorkingCopy >> singleCommit [ diff --git a/Iceberg/IceEmptyWorkingCopy.class.st b/Iceberg/IceEmptyWorkingCopy.class.st index 49ee9fb2c8..50e8c2e960 100644 --- a/Iceberg/IceEmptyWorkingCopy.class.st +++ b/Iceberg/IceEmptyWorkingCopy.class.st @@ -4,7 +4,7 @@ I am an empty working copy, with no loaded packages. Class { #name : #IceEmptyWorkingCopy, #superclass : #IceWorkingCopyState, - #category : 'Iceberg-WorkingCopy' + #category : #'Iceberg-WorkingCopy' } { #category : #display } @@ -19,12 +19,6 @@ IceEmptyWorkingCopy >> isDetached [ ^ false ] -{ #category : #merging } -IceEmptyWorkingCopy >> mergeStateWith: aMergeableState [ - - ^ aMergeableState mergeWithEmptyWorkingCopyState: self -] - { #category : #accessing } IceEmptyWorkingCopy >> referenceCommit [ diff --git a/Iceberg/IceInMergeWorkingCopy.class.st b/Iceberg/IceInMergeWorkingCopy.class.st index 453f62f4e2..72ce08b86d 100644 --- a/Iceberg/IceInMergeWorkingCopy.class.st +++ b/Iceberg/IceInMergeWorkingCopy.class.st @@ -4,7 +4,7 @@ I am a working copy whose packages are all in merge status in the same commits. Class { #name : #IceInMergeWorkingCopy, #superclass : #IceWorkingCopyState, - #category : 'Iceberg-WorkingCopy' + #category : #'Iceberg-WorkingCopy' } { #category : #display } @@ -25,12 +25,6 @@ IceInMergeWorkingCopy >> isInMerge [ ^ true ] -{ #category : #merging } -IceInMergeWorkingCopy >> mergeStateWith: aMergeableState [ - - ^ aMergeableState mergeWithInMergeWorkingCopyState: self -] - { #category : #accessing } IceInMergeWorkingCopy >> referenceCommits [ diff --git a/Iceberg/IceWorkingCopyState.class.st b/Iceberg/IceWorkingCopyState.class.st index 8526387117..21ddef1be1 100644 --- a/Iceberg/IceWorkingCopyState.class.st +++ b/Iceberg/IceWorkingCopyState.class.st @@ -66,12 +66,6 @@ IceWorkingCopyState >> mergeCommit: aCommit [ self subclassResponsibility ] -{ #category : #merging } -IceWorkingCopyState >> mergeStateWith: aMergeableState [ - - self subclassResponsibility -] - { #category : #accessing } IceWorkingCopyState >> referenceCommit [