[Pharo-project] in 11233 merging is broken?
Hi all I'm trying to integrate changes and apparently I cannot merge anymore nothing show up :). two questions: - do you get the behavior with 11233 or it is only me. - any idea of the potential problem - Issue 2071: subclasses and withAllSubclasses should return a array. - Issue 2076: Clean Exceptions. - Issue 2072: clean RealEstateAgent. Stef
Something must be wrong with the script load somehow... Note that there are changes between working copy after load and Polymorph-Tools-Diff-StephaneDucasse.23.mcz. To fix for yourself at the moment, reload Polymorph-Tools-Diff-StephaneDucasse.23.mcz. Not an answer to why though... Regards, Gary. ________________________________ From: Stéphane Ducasse <stephane.ducasse@inria.fr> To: Pharo-project Development <Pharo-project@lists.gforge.inria.fr> Sent: Thursday, 25 February, 2010 15:50:40 Subject: [Pharo-project] in 11233 merging is broken? Hi all I'm trying to integrate changes and apparently I cannot merge anymore nothing show up :). two questions: - do you get the behavior with 11233 or it is only me. - any idea of the potential problem - Issue 2071: subclasses and withAllSubclasses should return a array. - Issue 2076: Clean Exceptions. - Issue 2072: clean RealEstateAgent. Stef _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
On Feb 25, 2010, at 5:35 PM, GARY CHAMBERS wrote:
Something must be wrong with the script load somehow...
Note that there are changes between working copy after load and Polymorph-Tools-Diff-StephaneDucasse.23.mcz.
To fix for yourself at the moment, reload Polymorph-Tools-Diff-StephaneDucasse.23.mcz.
The Scriptloader seems to never loas from the repository? Ther is a Name: Polymorph-Tools-Diff-StephaneDucasse.46 Author: StephaneDucasse Time: 10 February 2010, 7:16:13 pm Marcus
Not an answer to why though...
Regards, Gary.
From: Stéphane Ducasse <stephane.ducasse@inria.fr> To: Pharo-project Development <Pharo-project@lists.gforge.inria.fr> Sent: Thursday, 25 February, 2010 15:50:40 Subject: [Pharo-project] in 11233 merging is broken?
Hi all
I'm trying to integrate changes and apparently I cannot merge anymore nothing show up :). two questions: - do you get the behavior with 11233 or it is only me. - any idea of the potential problem
- Issue 2071: subclasses and withAllSubclasses should return a array. - Issue 2076: Clean Exceptions. - Issue 2072: clean RealEstateAgent.
Stef _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
-- Marcus Denker -- http://www.marcusdenker.de INRIA Lille -- Nord Europe. Team RMoD.
I will have a look. Stef On Feb 25, 2010, at 10:38 PM, Marcus Denker wrote:
On Feb 25, 2010, at 5:35 PM, GARY CHAMBERS wrote:
Something must be wrong with the script load somehow...
Note that there are changes between working copy after load and Polymorph-Tools-Diff-StephaneDucasse.23.mcz.
To fix for yourself at the moment, reload Polymorph-Tools-Diff-StephaneDucasse.23.mcz.
The Scriptloader seems to never loas from the repository? Ther is a
Name: Polymorph-Tools-Diff-StephaneDucasse.46 Author: StephaneDucasse Time: 10 February 2010, 7:16:13 pm
Marcus
Not an answer to why though...
Regards, Gary.
From: Stéphane Ducasse <stephane.ducasse@inria.fr> To: Pharo-project Development <Pharo-project@lists.gforge.inria.fr> Sent: Thursday, 25 February, 2010 15:50:40 Subject: [Pharo-project] in 11233 merging is broken?
Hi all
I'm trying to integrate changes and apparently I cannot merge anymore nothing show up :). two questions: - do you get the behavior with 11233 or it is only me. - any idea of the potential problem
- Issue 2071: subclasses and withAllSubclasses should return a array. - Issue 2076: Clean Exceptions. - Issue 2072: clean RealEstateAgent.
Stef _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
-- Marcus Denker -- http://www.marcusdenker.de INRIA Lille -- Nord Europe. Team RMoD.
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Rather than ScriptLoader it appears to be a Monticello bug/feature... In PharoCore-1.1-11254 merging Polymorph-Widgets-gvc.109 from SqueakSource doesn't pull in PasteUpMorph>>restoreMorphicDisplay. In fact, after merge it will say "no changes" upon attempted remerge, despite the obvious difference. Something to do with MC doing snapshots relative to (common) ancestors rather then the wroking copy it seems... Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Friday, February 26, 2010 9:36 AM Subject: Re: [Pharo-project] in 11233 merging is broken? I will have a look. Stef On Feb 25, 2010, at 10:38 PM, Marcus Denker wrote:
On Feb 25, 2010, at 5:35 PM, GARY CHAMBERS wrote:
Something must be wrong with the script load somehow...
Note that there are changes between working copy after load and Polymorph-Tools-Diff-StephaneDucasse.23.mcz.
To fix for yourself at the moment, reload Polymorph-Tools-Diff-StephaneDucasse.23.mcz.
The Scriptloader seems to never loas from the repository? Ther is a
Name: Polymorph-Tools-Diff-StephaneDucasse.46 Author: StephaneDucasse Time: 10 February 2010, 7:16:13 pm
Marcus
Not an answer to why though...
Regards, Gary.
From: Stéphane Ducasse <stephane.ducasse@inria.fr> To: Pharo-project Development <Pharo-project@lists.gforge.inria.fr> Sent: Thursday, 25 February, 2010 15:50:40 Subject: [Pharo-project] in 11233 merging is broken?
Hi all
I'm trying to integrate changes and apparently I cannot merge anymore nothing show up :). two questions: - do you get the behavior with 11233 or it is only me. - any idea of the potential problem
- Issue 2071: subclasses and withAllSubclasses should return a array. - Issue 2076: Clean Exceptions. - Issue 2072: clean RealEstateAgent.
Stef _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
-- Marcus Denker -- http://www.marcusdenker.de INRIA Lille -- Nord Europe. Team RMoD.
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
thanks for investigating that. It seems to me that MC has some dark corners full of gremlins Stef On Mar 9, 2010, at 4:30 PM, Gary Chambers wrote:
Rather than ScriptLoader it appears to be a Monticello bug/feature...
In PharoCore-1.1-11254 merging Polymorph-Widgets-gvc.109 from SqueakSource doesn't pull in PasteUpMorph>>restoreMorphicDisplay.
In fact, after merge it will say "no changes" upon attempted remerge, despite the obvious difference. Something to do with MC doing snapshots relative to (common) ancestors rather then the wroking copy it seems...
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Friday, February 26, 2010 9:36 AM Subject: Re: [Pharo-project] in 11233 merging is broken?
I will have a look.
Stef
On Feb 25, 2010, at 10:38 PM, Marcus Denker wrote:
On Feb 25, 2010, at 5:35 PM, GARY CHAMBERS wrote:
Something must be wrong with the script load somehow...
Note that there are changes between working copy after load and Polymorph-Tools-Diff-StephaneDucasse.23.mcz.
To fix for yourself at the moment, reload Polymorph-Tools-Diff-StephaneDucasse.23.mcz.
The Scriptloader seems to never loas from the repository? Ther is a
Name: Polymorph-Tools-Diff-StephaneDucasse.46 Author: StephaneDucasse Time: 10 February 2010, 7:16:13 pm
Marcus
Not an answer to why though...
Regards, Gary.
From: Stéphane Ducasse <stephane.ducasse@inria.fr> To: Pharo-project Development <Pharo-project@lists.gforge.inria.fr> Sent: Thursday, 25 February, 2010 15:50:40 Subject: [Pharo-project] in 11233 merging is broken?
Hi all
I'm trying to integrate changes and apparently I cannot merge anymore nothing show up :). two questions: - do you get the behavior with 11233 or it is only me. - any idea of the potential problem
- Issue 2071: subclasses and withAllSubclasses should return a array. - Issue 2076: Clean Exceptions. - Issue 2072: clean RealEstateAgent.
Stef _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
-- Marcus Denker -- http://www.marcusdenker.de INRIA Lille -- Nord Europe. Team RMoD.
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
2010/2/25 GARY CHAMBERS <gazzaguru2@btinternet.com>:
Something must be wrong with the script load somehow... Note that there are changes between working copy after load and Polymorph-Tools-Diff-StephaneDucasse.23.mcz. To fix for yourself at the moment, reload Polymorph-Tools-Diff-StephaneDucasse.23.mcz.
This doesn't work for me as a fix.
I have the issue here. On Thu, Feb 25, 2010 at 10:50 AM, Stéphane Ducasse <stephane.ducasse@inria.fr> wrote:
Hi all
I'm trying to integrate changes and apparently I cannot merge anymore nothing show up :). two questions: Â Â Â Â - do you get the behavior with 11233 or it is only me. Â Â Â Â - any idea of the potential problem
        - Issue 2071:  subclasses and withAllSubclasses should return a array.         - Issue 2076:  Clean Exceptions.         - Issue 2072:  clean RealEstateAgent.
Stef _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
participants (5)
-
GARY CHAMBERS -
Gary Chambers
-
Marcus Denker -
Sean Allen -
Stéphane Ducasse