[Pharo-project] Merging tool and class var
Hello all, The new monticello merging tool looks very nice. However, it's hard to tell whether the change is related to instance side or class side. Try with Multilingual-adrian_lienhard.47 which does exclusively class side changes... The change of class inst var appears like an unchanged definition of class. And methods are not indicated as class methods. I wonder what happens if a method with same name is changed both in instance and class side... Nicolas
Looking at this now. Managed to get the tree to separate list the class/meta for changed methods. Will make up some package with a class instance var change to see about the rest. As for methods with the same name, your current version will show both with the same name (but likely different source) under the instance-side class. Regards, Gary. ----- Original Message ----- From: "nicolas cellier" <ncellier@ifrance.com> To: <pharo-project@lists.gforge.inria.fr> Sent: Monday, January 12, 2009 8:09 PM Subject: [Pharo-project] Merging tool and class var
Hello all, The new monticello merging tool looks very nice. However, it's hard to tell whether the change is related to instance side or class side.
Try with Multilingual-adrian_lienhard.47 which does exclusively class side changes... The change of class inst var appears like an unchanged definition of class. And methods are not indicated as class methods.
I wonder what happens if a method with same name is changed both in instance and class side...
Nicolas
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
As for methods with the same name, your current version will show both with the same name (but likely different source) under the instance-side class.
Might I report another problem? When the class comment changes this is not obvious, you only see the class definition that has not changed. Cheers, Lukas -- Lukas Renggli http://www.lukas-renggli.ch
Indeed. Just finished for class-side definition changes, comment and commentStamp... Putting up on SqueakSource shortly. Regards, Gary. ----- Original Message ----- From: "Lukas Renggli" <renggli@gmail.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 12:39 PM Subject: Re: [Pharo-project] Merging tool and class var
As for methods with the same name, your current version will show both with the same name (but likely different source) under the instance-side class.
Might I report another problem?
When the class comment changes this is not obvious, you only see the class definition that has not changed.
Cheers, Lukas
-- Lukas Renggli http://www.lukas-renggli.ch
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Indeed. Just finished for class-side definition changes, comment and commentStamp... Putting up on SqueakSource shortly.
Great! Lukas -- Lukas Renggli http://www.lukas-renggli.ch
On SqueakSource. Polymorph-Widgets-gvc.26 (mostly Watery2 enhancements) and Polymorph-Tools-Diff-gvc.8 (should deal with all the current feedback). Regards, Gary. ----- Original Message ----- From: "Lukas Renggli" <renggli@gmail.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:15 PM Subject: Re: [Pharo-project] Merging tool and class var
Indeed. Just finished for class-side definition changes, comment and commentStamp... Putting up on SqueakSource shortly.
Great!
Lukas
-- Lukas Renggli http://www.lukas-renggli.ch
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
----- Original Message ----- From: "Gary Chambers" <gazzaguru2@btinternet.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:35 PM Subject: Re: [Pharo-project] Merging tool and class var
On SqueakSource. Polymorph-Widgets-gvc.26 (mostly Watery2 enhancements) and Polymorph-Tools-Diff-gvc.8 (should deal with all the current feedback).
With the exception of labelling each side of the diff ;-) Gary.
Regards, Gary.
----- Original Message ----- From: "Lukas Renggli" <renggli@gmail.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:15 PM Subject: Re: [Pharo-project] Merging tool and class var
Indeed. Just finished for class-side definition changes, comment and commentStamp... Putting up on SqueakSource shortly.
Great!
Lukas
-- Lukas Renggli http://www.lukas-renggli.ch
_______________________________________________ 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
excellent I will produce a new version. On Jan 14, 2009, at 3:35 PM, Gary Chambers wrote:
On SqueakSource. Polymorph-Widgets-gvc.26 (mostly Watery2 enhancements) and Polymorph-Tools-Diff-gvc.8 (should deal with all the current feedback).
Regards, Gary.
----- Original Message ----- From: "Lukas Renggli" <renggli@gmail.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:15 PM Subject: Re: [Pharo-project] Merging tool and class var
Indeed. Just finished for class-side definition changes, comment and commentStamp... Putting up on SqueakSource shortly.
Great!
Lukas
-- Lukas Renggli http://www.lukas-renggli.ch
_______________________________________________ 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
Which reminds me to make some time for working out the diffences between Pharo and Squeak so as to have the dissimilar methods packaged separately for each (generally Widgets stuff). Perhaps Marcus can provide me with a list of the things he merges manually... Reagrds, Gary. ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 6:48 PM Subject: Re: [Pharo-project] Merging tool and class var
excellent I will produce a new version.
On Jan 14, 2009, at 3:35 PM, Gary Chambers wrote:
On SqueakSource. Polymorph-Widgets-gvc.26 (mostly Watery2 enhancements) and Polymorph-Tools-Diff-gvc.8 (should deal with all the current feedback).
Regards, Gary.
----- Original Message ----- From: "Lukas Renggli" <renggli@gmail.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:15 PM Subject: Re: [Pharo-project] Merging tool and class var
Indeed. Just finished for class-side definition changes, comment and commentStamp... Putting up on SqueakSource shortly.
Great!
Lukas
-- Lukas Renggli http://www.lukas-renggli.ch
_______________________________________________ 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
gary while loading Polymorph-Widgets-gvc.26 crashed on BorderedMorph>>key In addition doing the alignmentMorph cleanup that I will integrate we got some polymorph overrides could you check that? Stef On Jan 14, 2009, at 4:07 PM, Gary Chambers wrote:
----- Original Message ----- From: "Gary Chambers" <gazzaguru2@btinternet.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:35 PM Subject: Re: [Pharo-project] Merging tool and class var
On SqueakSource. Polymorph-Widgets-gvc.26 (mostly Watery2 enhancements) and Polymorph-Tools-Diff-gvc.8 (should deal with all the current feedback).
With the exception of labelling each side of the diff ;-) Gary.
Regards, Gary.
----- Original Message ----- From: "Lukas Renggli" <renggli@gmail.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:15 PM Subject: Re: [Pharo-project] Merging tool and class var
Indeed. Just finished for class-side definition changes, comment and commentStamp... Putting up on SqueakSource shortly.
Great!
Lukas
-- Lukas Renggli http://www.lukas-renggli.ch
_______________________________________________ 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
Aye. Is down to the (structure) changes for focus indicator morphs. Will put in a compatability check... Regards, Gary. ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Monday, January 19, 2009 8:12 PM Subject: Re: [Pharo-project] Merging tool and class var
gary while loading
Polymorph-Widgets-gvc.26 crashed on BorderedMorph>>key
In addition doing the alignmentMorph cleanup that I will integrate we got some polymorph overrides could you check that?
Stef
On Jan 14, 2009, at 4:07 PM, Gary Chambers wrote:
----- Original Message ----- From: "Gary Chambers" <gazzaguru2@btinternet.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:35 PM Subject: Re: [Pharo-project] Merging tool and class var
On SqueakSource. Polymorph-Widgets-gvc.26 (mostly Watery2 enhancements) and Polymorph-Tools-Diff-gvc.8 (should deal with all the current feedback).
With the exception of labelling each side of the diff ;-) Gary.
Regards, Gary.
----- Original Message ----- From: "Lukas Renggli" <renggli@gmail.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:15 PM Subject: Re: [Pharo-project] Merging tool and class var
Indeed. Just finished for class-side definition changes, comment and commentStamp... Putting up on SqueakSource shortly.
Great!
Lukas
-- Lukas Renggli http://www.lukas-renggli.ch
_______________________________________________ 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
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Should be ok merging Polymorph-Widgets-gvc.28 now. Regards, Gary. ----- Original Message ----- From: "Gary Chambers" <gazzaguru2@btinternet.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, January 20, 2009 11:07 AM Subject: Re: [Pharo-project] Merging tool and class var Aye. Is down to the (structure) changes for focus indicator morphs. Will put in a compatability check... Regards, Gary. ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Monday, January 19, 2009 8:12 PM Subject: Re: [Pharo-project] Merging tool and class var
gary while loading
Polymorph-Widgets-gvc.26 crashed on BorderedMorph>>key
In addition doing the alignmentMorph cleanup that I will integrate we got some polymorph overrides could you check that?
Stef
On Jan 14, 2009, at 4:07 PM, Gary Chambers wrote:
----- Original Message ----- From: "Gary Chambers" <gazzaguru2@btinternet.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:35 PM Subject: Re: [Pharo-project] Merging tool and class var
On SqueakSource. Polymorph-Widgets-gvc.26 (mostly Watery2 enhancements) and Polymorph-Tools-Diff-gvc.8 (should deal with all the current feedback).
With the exception of labelling each side of the diff ;-) Gary.
Regards, Gary.
----- Original Message ----- From: "Lukas Renggli" <renggli@gmail.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:15 PM Subject: Re: [Pharo-project] Merging tool and class var
Indeed. Just finished for class-side definition changes, comment and commentStamp... Putting up on SqueakSource shortly.
Great!
Lukas
-- Lukas Renggli http://www.lukas-renggli.ch
_______________________________________________ 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
_______________________________________________ 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 I will check On Jan 20, 2009, at 12:19 PM, Gary Chambers wrote:
Should be ok merging Polymorph-Widgets-gvc.28 now.
Regards, Gary.
----- Original Message ----- From: "Gary Chambers" <gazzaguru2@btinternet.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, January 20, 2009 11:07 AM Subject: Re: [Pharo-project] Merging tool and class var
Aye. Is down to the (structure) changes for focus indicator morphs. Will put in a compatability check...
Regards, Gary.
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Monday, January 19, 2009 8:12 PM Subject: Re: [Pharo-project] Merging tool and class var
gary while loading
Polymorph-Widgets-gvc.26 crashed on BorderedMorph>>key
In addition doing the alignmentMorph cleanup that I will integrate we got some polymorph overrides could you check that?
Stef
On Jan 14, 2009, at 4:07 PM, Gary Chambers wrote:
----- Original Message ----- From: "Gary Chambers" <gazzaguru2@btinternet.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:35 PM Subject: Re: [Pharo-project] Merging tool and class var
On SqueakSource. Polymorph-Widgets-gvc.26 (mostly Watery2 enhancements) and Polymorph-Tools-Diff-gvc.8 (should deal with all the current feedback).
With the exception of labelling each side of the diff ;-) Gary.
Regards, Gary.
----- Original Message ----- From: "Lukas Renggli" <renggli@gmail.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, January 14, 2009 2:15 PM Subject: Re: [Pharo-project] Merging tool and class var
Indeed. Just finished for class-side definition changes, comment and commentStamp... Putting up on SqueakSource shortly.
Great!
Lukas
-- Lukas Renggli http://www.lukas-renggli.ch
_______________________________________________ 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
_______________________________________________ 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
participants (4)
-
Gary Chambers -
Lukas Renggli -
nicolas cellier -
Stéphane Ducasse