Regression in "Upgrade is Merge" preference?

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

Regression in "Upgrade is Merge" preference?

marcel.taeumel
Hi, there.

I just discovered a big mess in my working image. I have to recover a recent code slice because the update seems to have reverted several changes. It might be related to extension methods. I don't know.


See the problem?

Best,
Marcel


Reply | Threaded
Open this post in threaded view
|

Re: Regression in "Upgrade is Merge" preference?

marcel.taeumel
Well, here is how I found the lost changes:

| result msgs |
result := OrderedCollection new.
msgs := ChangeSet current changedMessageList.

SystemNavigation default allCompiledMethodDo: [:m |
| records b |
b := VersionsBrowser new.
b
scanVersionsOf: m
class: m methodClass
meta: m methodClass isMeta
category: ''
selector: m selector.
records := b changeList.
(((records size > 1
and: [records second timeStamp > records first timeStamp])
and: [records second stamp beginsWith: 'mt'])
and: [msgs includes: m methodReference]) 
ifTrue: [result add: m methodReference]].
MessageSet openMessageList: result name: 'Lost Changes'.


Mostly those deprecations. Still strange. :-(

Best,
Marcel

Am 04.05.2018 09:31:17 schrieb Marcel Taeumel <[hidden email]>:

Hi, there.

I just discovered a big mess in my working image. I have to recover a recent code slice because the update seems to have reverted several changes. It might be related to extension methods. I don't know.


See the problem?

Best,
Marcel


Reply | Threaded
Open this post in threaded view
|

Re: Regression in "Upgrade is Merge" preference?

Bert Freudenberg
In reply to this post by marcel.taeumel


On 4 May 2018 at 00:31, Marcel Taeumel <[hidden email]> wrote:
Hi, there.

I just discovered a big mess in my working image. I have to recover a recent code slice because the update seems to have reverted several changes. It might be related to extension methods. I don't know.


See the problem?

So you moved this method to *60Deprecated, and merging another version moved it back? Can you replicate this?

- Bert -



Reply | Threaded
Open this post in threaded view
|

Re: Regression in "Upgrade is Merge" preference?

marcel.taeumel
I moved it *and* changed it (i.e. "self deprecated: ..."). Not sure how to replicate it...

Best,
Marcel

Am 04.05.2018 21:08:21 schrieb Bert Freudenberg <[hidden email]>:



On 4 May 2018 at 00:31, Marcel Taeumel <[hidden email]> wrote:
Hi, there.

I just discovered a big mess in my working image. I have to recover a recent code slice because the update seems to have reverted several changes. It might be related to extension methods. I don't know.


See the problem?

So you moved this method to *60Deprecated, and merging another version moved it back? Can you replicate this?

- Bert -