Skip to content

Commit

Permalink
Merge pull request #1707 from MarcusDenker/DeadCode-mergeStateWith
Browse files Browse the repository at this point in the history
#mergeStateWith: has no senders, but sends selectors that do not exist
  • Loading branch information
tesonep authored Jun 30, 2023
2 parents 8307273 + 969ef1f commit 03c6413
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 26 deletions.
6 changes: 0 additions & 6 deletions Iceberg/IceAttachedSingleVersionWorkingCopy.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@ IceAttachedSingleVersionWorkingCopy >> mergeCommit: mergeCommit [
execute.
]

{ #category : #merging }
IceAttachedSingleVersionWorkingCopy >> mergeStateWith: aMergeableState [

^ aMergeableState mergeWithSingleVersionWorkingCopyState: self
]

{ #category : #accessing }
IceAttachedSingleVersionWorkingCopy >> singleCommit [

Expand Down
8 changes: 1 addition & 7 deletions Iceberg/IceEmptyWorkingCopy.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -19,12 +19,6 @@ IceEmptyWorkingCopy >> isDetached [
^ false
]

{ #category : #merging }
IceEmptyWorkingCopy >> mergeStateWith: aMergeableState [

^ aMergeableState mergeWithEmptyWorkingCopyState: self
]

{ #category : #accessing }
IceEmptyWorkingCopy >> referenceCommit [

Expand Down
8 changes: 1 addition & 7 deletions Iceberg/IceInMergeWorkingCopy.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -25,12 +25,6 @@ IceInMergeWorkingCopy >> isInMerge [
^ true
]

{ #category : #merging }
IceInMergeWorkingCopy >> mergeStateWith: aMergeableState [

^ aMergeableState mergeWithInMergeWorkingCopyState: self
]

{ #category : #accessing }
IceInMergeWorkingCopy >> referenceCommits [

Expand Down
6 changes: 0 additions & 6 deletions Iceberg/IceWorkingCopyState.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@ IceWorkingCopyState >> mergeCommit: aCommit [
self subclassResponsibility
]

{ #category : #merging }
IceWorkingCopyState >> mergeStateWith: aMergeableState [

self subclassResponsibility
]

{ #category : #accessing }
IceWorkingCopyState >> referenceCommit [

Expand Down

0 comments on commit 03c6413

Please sign in to comment.