[Pharo-project] request for the new merge tool :)
hi gary it would be important to be able to install a method by clicking on it as we could do it in the old one. Stef
Should be straightforward... Any other menu options you'd like? Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: "Pharo Development" <Pharo-project@lists.gforge.inria.fr> Sent: Saturday, July 04, 2009 5:02 PM Subject: [Pharo-project] request for the new merge tool :)
hi gary
it would be important to be able to install a method by clicking on it as we could do it in the old one.
Stef
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Thanks gary. may be version Install is really important because it allows one to somehow cherry pick changes when we should not load the complete changes set. Stef On Jul 6, 2009, at 10:07 AM, Gary Chambers wrote:
Should be straightforward... Any other menu options you'd like?
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: "Pharo Development" <Pharo-project@lists.gforge.inria.fr> Sent: Saturday, July 04, 2009 5:02 PM Subject: [Pharo-project] request for the new merge tool :)
hi gary
it would be important to be able to install a method by clicking on it as we could do it in the old one.
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
The version option is already there (existing versions in changes/sources files). It might be possible for non-conflicting methods to have the "Keep current version"/"Use incoming version" options enabled to effectively manage the same as the proposed "Install" option. Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Monday, July 06, 2009 10:34 AM Subject: Re: [Pharo-project] request for the new merge tool :) Thanks gary. may be version Install is really important because it allows one to somehow cherry pick changes when we should not load the complete changes set. Stef On Jul 6, 2009, at 10:07 AM, Gary Chambers wrote:
Should be straightforward... Any other menu options you'd like?
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: "Pharo Development" <Pharo-project@lists.gforge.inria.fr> Sent: Saturday, July 04, 2009 5:02 PM Subject: [Pharo-project] request for the new merge tool :)
hi gary
it would be important to be able to install a method by clicking on it as we could do it in the old one.
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
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
On Mon, Jul 6, 2009 at 10:07 AM, Gary Chambers<gazzaguru2@btinternet.com> wrote:
Should be straightforward... Any other menu options you'd like?
Please Gary... add labels on top of the code areas. I want to know what is displayed on the left and what is on the right :-) -- Damien Cassou http://damiencassou.seasidehosting.st "Lambdas are relegated to relative obscurity until Java makes them popular by not having them." James Iry
Please Gary... add labels on top of the code areas. I want to know what is displayed on the left and what is on the right :-)
+ 1 Alexandre -- _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: Alexandre Bergel http://www.bergel.eu ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
On Mon, Jul 6, 2009 at 11:53 AM, Alexandre Bergel <alexandre@bergel.eu>wrote:
Please Gary... add labels on top of the code areas. I want to know what is displayed on the left and what is on the right :-)
+ 1
+ 99999999 I always have so see code to understand which is which :)
Alexandre
-- _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: Alexandre Bergel http://www.bergel.eu ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
I'll see. The current model (MCThreeWayMerger) doesn't have that info so will need to be passed in at point of creation. For reference, when merging (rather than comparing) the left hand side is always what's currently in the image and the right hand side that which is incoming from the package selected to be merged. Regards, Gary ----- Original Message ----- From: Mariano Martinez Peck To: Pharo-project@lists.gforge.inria.fr Sent: Monday, July 06, 2009 2:41 PM Subject: Re: [Pharo-project] request for the new merge tool :) On Mon, Jul 6, 2009 at 11:53 AM, Alexandre Bergel <alexandre@bergel.eu> wrote: > Please Gary... add labels on top of the code areas. I want to know > what is displayed on the left and what is on the right :-) + 1 + 99999999 I always have so see code to understand which is which :) Alexandre -- _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: Alexandre Bergel http://www.bergel.eu ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;. _______________________________________________ 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
2009/7/6 Gary Chambers <gazzaguru2@btinternet.com>:
For reference, when merging (rather than comparing) the left hand side is always what's currently in the image and the right hand side that which is incoming from the package selected to be merged.
That note would already be appreciated in the tool as a comment. -- Damien Cassou http://damiencassou.seasidehosting.st "Lambdas are relegated to relative obscurity until Java makes them popular by not having them." James Iry
the merge tool is driving me a little mad... How hard would it be to make this change? Also is there any documentation available on the polymorph merge tool? thanks, Mike On Mon, Jul 6, 2009 at 4:03 PM, Damien Cassou<damien.cassou@gmail.com> wrote:
2009/7/6 Gary Chambers <gazzaguru2@btinternet.com>:
For reference, when merging (rather than comparing) the left hand side is always what's currently in the image and the right hand side that which is incoming from the package selected to be merged.
That note would already be appreciated in the tool as a comment.
-- Damien Cassou http://damiencassou.seasidehosting.st
"Lambdas are relegated to relative obscurity until Java makes them popular by not having them." James Iry
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
the merge tool is driving me a little mad... How hard would it be to make this change? Also is there any documentation available on the polymorph merge tool?
I use Preferences disable: #useNewDiffToolsForMC. to get the old merge/diff tool. The new one doesn't work for me at all. Lukas -- Lukas Renggli http://www.lukas-renggli.ch
yes I agree. Here is some feedback since I can see a lot of work has gone into it and I don't want to knock it. Some of this may be mc behaviour I don't know. -it takes a second from pressing a menu item to updating the ui. On a large number of changes this is to slow -key bindings for quickly selecting the direction of merge and moving on to the next item -multiple select. I should be able to select multiple items on the tree and have certain menu options enabled. Eg keep local change - it also should be possible to easily reject or include a whole class - it should label the left and right panes - it would be really nice to show or allow to prune mc package ancestry on the source so you only show a certain slice through the source ancestry and ignore the rest - it produces a lot of false positives - it seems there is no way to not merge an item that has a tick by it? I don't quite get what tick means. Ditto for the cross ? - a lot of the classes have no class comments thanks mike On Tuesday, September 8, 2009, Lukas Renggli <renggli@gmail.com> wrote:
the merge tool is driving me a little mad... How hard would it be to make this change? Also is there any documentation available on the polymorph merge tool?
I use
 Preferences disable: #useNewDiffToolsForMC.
to get the old merge/diff tool. The new one doesn't work for me at all.
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
may be the first step would be to add back the install menu items. Most of the time the rest worked for me. Now for browsing the changes in the squeak trunk we should find a way to select only change between two versions and even using the history button I could not exactly get what I wanted. Lukas did you succeed to do this kind of operation? stef On Sep 8, 2009, at 9:46 AM, Michael Roberts wrote:
yes I agree. Here is some feedback since I can see a lot of work has gone into it and I don't want to knock it. Some of this may be mc behaviour I don't know. -it takes a second from pressing a menu item to updating the ui. On a large number of changes this is to slow -key bindings for quickly selecting the direction of merge and moving on to the next item -multiple select. I should be able to select multiple items on the tree and have certain menu options enabled. Eg keep local change - it also should be possible to easily reject or include a whole class - it should label the left and right panes - it would be really nice to show or allow to prune mc package ancestry on the source so you only show a certain slice through the source ancestry and ignore the rest - it produces a lot of false positives - it seems there is no way to not merge an item that has a tick by it? I don't quite get what tick means. Ditto for the cross ? - a lot of the classes have no class comments
thanks mike
On Tuesday, September 8, 2009, Lukas Renggli <renggli@gmail.com> wrote:
the merge tool is driving me a little mad... How hard would it be to make this change? Also is there any documentation available on the polymorph merge tool?
I use
Preferences disable: #useNewDiffToolsForMC.
to get the old merge/diff tool. The new one doesn't work for me at all.
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
may be the first step would be to add back the install menu items.
These are definitely crucial for being able to cherry pick changes from different versions.
Now for browsing the changes in the squeak trunk we should find a way to select only change between two versions and even using the history button I could not exactly get what I wanted. Lukas did you succeed to do this kind of operation?
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions. The Changes button displays the diff between the image and the selected version. Lukas -- Lukas Renggli http://www.lukas-renggli.ch
On Tue, Sep 8, 2009 at 2:38 PM, Lukas Renggli<renggli@gmail.com> wrote:
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
What about backport? http://lists.squeakfoundation.org/pipermail/squeak-dev/2004-September/082094... -- Damien Cassou http://damiencassou.seasidehosting.st "Lambdas are relegated to relative obscurity until Java makes them popular by not having them." James Iry
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
What about backport? http://lists.squeakfoundation.org/pipermail/squeak-dev/2004-September/082094...
That works in the wrong direction for me. I prefer to load changes into my working copy instead of having to load the other code and "backporting" my changes into their code. Lukas -- Lukas Renggli http://www.lukas-renggli.ch
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
What about backport? http://lists.squeakfoundation.org/pipermail/squeak-dev/2004-September/082094...
That works in the wrong direction for me. I prefer to load changes into my working copy instead of having to load the other code and "backporting" my changes into their code.
Lukas
What about an option for go forward or backward. It really on which fork of the code is considered the 'root' and that is often in the eyes of the beholder.
-- 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
would be great. Send code :) On Sep 8, 2009, at 4:24 PM, rkrock@locksleycreeksoftware.com wrote:
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
What about backport? http://lists.squeakfoundation.org/pipermail/squeak-dev/2004-September/082094...
That works in the wrong direction for me. I prefer to load changes into my working copy instead of having to load the other code and "backporting" my changes into their code.
Lukas
What about an option for go forward or backward. It really on which fork of the code is considered the 'root' and that is often in the eyes of the beholder.
-- 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
Would be great to decide on the UI we want then make MC play ball... Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 3:28 PM Subject: Re: [Pharo-project] request for the new merge tool :)
would be great. Send code :)
On Sep 8, 2009, at 4:24 PM, rkrock@locksleycreeksoftware.com wrote:
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
What about backport? http://lists.squeakfoundation.org/pipermail/squeak-dev/2004-September/082094...
That works in the wrong direction for me. I prefer to load changes into my working copy instead of having to load the other code and "backporting" my changes into their code.
Lukas
What about an option for go forward or backward. It really on which fork of the code is considered the 'root' and that is often in the eyes of the beholder.
-- 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 having the install code is really important.
Would be great to decide on the UI we want then make MC play ball...
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 3:28 PM Subject: Re: [Pharo-project] request for the new merge tool :)
would be great. Send code :)
On Sep 8, 2009, at 4:24 PM, rkrock@locksleycreeksoftware.com wrote:
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
What about backport? http://lists.squeakfoundation.org/pipermail/squeak-dev/2004-September/082094...
That works in the wrong direction for me. I prefer to load changes into my working copy instead of having to load the other code and "backporting" my changes into their code.
Lukas
What about an option for go forward or backward. It really on which fork of the code is considered the 'root' and that is often in the eyes of the beholder.
-- 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
Install code? Just pointing out that we should all-together decide how we want MC to interact with the user then decide you to get MC to support that... maybe MC1.0/1.5/2.0 who knows. There are clearly different needs fo all of us. Just trying to get things pinned down (somewhat) before moving things along. Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 5:47 PM Subject: Re: [Pharo-project] request for the new merge tool :) Gary having the install code is really important.
Would be great to decide on the UI we want then make MC play ball...
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 3:28 PM Subject: Re: [Pharo-project] request for the new merge tool :)
would be great. Send code :)
On Sep 8, 2009, at 4:24 PM, rkrock@locksleycreeksoftware.com wrote:
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
What about backport? http://lists.squeakfoundation.org/pipermail/squeak-dev/2004-September/082094...
That works in the wrong direction for me. I prefer to load changes into my working copy instead of having to load the other code and "backporting" my changes into their code.
Lukas
What about an option for go forward or backward. It really on which fork of the code is considered the 'root' and that is often in the eyes of the beholder.
-- 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
On Sep 8, 2009, at 6:53 PM, Gary Chambers wrote:
Install code?
No install menu :) Gary in the old merge tool you can select a change and install it bringing the menu on the item This is important since we can chose what we want to install or not. So the behavior is there since it is working with the old one. Stef
Just pointing out that we should all-together decide how we want MC to interact with the user then decide you to get MC to support that... maybe MC1.0/1.5/2.0 who knows.
There are clearly different needs fo all of us. Just trying to get things pinned down (somewhat) before moving things along.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 5:47 PM Subject: Re: [Pharo-project] request for the new merge tool :)
Gary having the install code is really important.
Would be great to decide on the UI we want then make MC play ball...
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 3:28 PM Subject: Re: [Pharo-project] request for the new merge tool :)
would be great. Send code :)
On Sep 8, 2009, at 4:24 PM, rkrock@locksleycreeksoftware.com wrote:
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
What about backport? http://lists.squeakfoundation.org/pipermail/squeak-dev/2004-September/082094...
That works in the wrong direction for me. I prefer to load changes into my working copy instead of having to load the other code and "backporting" my changes into their code.
Lukas
What about an option for go forward or backward. It really on which fork of the code is considered the 'root' and that is often in the eyes of the beholder.
-- 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
Yes, I see for "pick-and-mix". That kind of bypasses the merge, as such. I'd suggest that the MC model could be revised to allow such operations. Or, I can just add another menu choice like the old tools... Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 7:18 PM Subject: Re: [Pharo-project] request for the new merge tool :) On Sep 8, 2009, at 6:53 PM, Gary Chambers wrote:
Install code?
No install menu :) Gary in the old merge tool you can select a change and install it bringing the menu on the item This is important since we can chose what we want to install or not. So the behavior is there since it is working with the old one. Stef
Just pointing out that we should all-together decide how we want MC to interact with the user then decide you to get MC to support that... maybe MC1.0/1.5/2.0 who knows.
There are clearly different needs fo all of us. Just trying to get things pinned down (somewhat) before moving things along.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 5:47 PM Subject: Re: [Pharo-project] request for the new merge tool :)
Gary having the install code is really important.
Would be great to decide on the UI we want then make MC play ball...
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 3:28 PM Subject: Re: [Pharo-project] request for the new merge tool :)
would be great. Send code :)
On Sep 8, 2009, at 4:24 PM, rkrock@locksleycreeksoftware.com wrote:
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
What about backport? http://lists.squeakfoundation.org/pipermail/squeak-dev/2004-September/082094...
That works in the wrong direction for me. I prefer to load changes into my working copy instead of having to load the other code and "backporting" my changes into their code.
Lukas
What about an option for go forward or backward. It really on which fork of the code is considered the 'root' and that is often in the eyes of the beholder.
-- 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
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
On Sep 8, 2009, at 8:34 PM, Gary Chambers wrote:
Yes, I see for "pick-and-mix". That kind of bypasses the merge, as such.
I'd suggest that the MC model could be revised to allow such operations. Or, I can just add another menu choice like the old tools...
for now a menu would be great! Stef
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 7:18 PM Subject: Re: [Pharo-project] request for the new merge tool :)
On Sep 8, 2009, at 6:53 PM, Gary Chambers wrote:
Install code?
No install menu :) Gary in the old merge tool you can select a change and install it bringing the menu on the item This is important since we can chose what we want to install or not. So the behavior is there since it is working with the old one.
Stef
Just pointing out that we should all-together decide how we want MC to interact with the user then decide you to get MC to support that... maybe MC1.0/1.5/2.0 who knows.
There are clearly different needs fo all of us. Just trying to get things pinned down (somewhat) before moving things along.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 5:47 PM Subject: Re: [Pharo-project] request for the new merge tool :)
Gary having the install code is really important.
Would be great to decide on the UI we want then make MC play ball...
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 3:28 PM Subject: Re: [Pharo-project] request for the new merge tool :)
would be great. Send code :)
On Sep 8, 2009, at 4:24 PM, rkrock@locksleycreeksoftware.com wrote:
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
What about backport? http://lists.squeakfoundation.org/pipermail/squeak-dev/2004-September/082094...
That works in the wrong direction for me. I prefer to load changes into my working copy instead of having to load the other code and "backporting" my changes into their code.
Lukas
What about an option for go forward or backward. It really on which fork of the code is considered the 'root' and that is often in the eyes of the beholder.
-- 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
_______________________________________________ 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
No problem. Will stick in the new release, when done! You may have noticed we are a bit busy (Polymorph improvements included). Can't say more than that at the moment. Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 7:43 PM Subject: Re: [Pharo-project] request for the new merge tool :) On Sep 8, 2009, at 8:34 PM, Gary Chambers wrote:
Yes, I see for "pick-and-mix". That kind of bypasses the merge, as such.
I'd suggest that the MC model could be revised to allow such operations. Or, I can just add another menu choice like the old tools...
for now a menu would be great! Stef
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 7:18 PM Subject: Re: [Pharo-project] request for the new merge tool :)
On Sep 8, 2009, at 6:53 PM, Gary Chambers wrote:
Install code?
No install menu :) Gary in the old merge tool you can select a change and install it bringing the menu on the item This is important since we can chose what we want to install or not. So the behavior is there since it is working with the old one.
Stef
Just pointing out that we should all-together decide how we want MC to interact with the user then decide you to get MC to support that... maybe MC1.0/1.5/2.0 who knows.
There are clearly different needs fo all of us. Just trying to get things pinned down (somewhat) before moving things along.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 5:47 PM Subject: Re: [Pharo-project] request for the new merge tool :)
Gary having the install code is really important.
Would be great to decide on the UI we want then make MC play ball...
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 3:28 PM Subject: Re: [Pharo-project] request for the new merge tool :)
would be great. Send code :)
On Sep 8, 2009, at 4:24 PM, rkrock@locksleycreeksoftware.com wrote:
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
What about backport? http://lists.squeakfoundation.org/pipermail/squeak-dev/2004-September/082094...
That works in the wrong direction for me. I prefer to load changes into my working copy instead of having to load the other code and "backporting" my changes into their code.
Lukas
What about an option for go forward or backward. It really on which fork of the code is considered the 'root' and that is often in the eyes of the beholder.
-- 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
_______________________________________________ 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
On 8 sept. 09, at 14:38, Lukas Renggli wrote:
Now for browsing the changes in the squeak trunk we should find a way to select only change between two versions and even using the history button I could not exactly get what I wanted. Lukas did you succeed to do this kind of operation?
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
Wow, thanks, I wasn't aware of that. I always thought that the Monticello browser was quite simplistic - it is just carefully hidden :) So I tried and this is not so simple. Here is what to do: - select a package, then the History button - it opens a Version history browser - now if you right-click a version of the package, you have a contextual menu with two options: 'view changes -> working copy' and 'spawn history' - select the latest version with which you want to compare and spawn history - it opens a new version browser where you can compare previous versions with the one you selected -- Simon
On Sep 8, 2009, at 2:38 PM, Lukas Renggli wrote:
may be the first step would be to add back the install menu items.
These are definitely crucial for being able to cherry pick changes from different versions.
yessssss so may be we should add it :)
Now for browsing the changes in the squeak trunk we should find a way to select only change between two versions and even using the history button I could not exactly get what I wanted. Lukas did you succeed to do this kind of operation?
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
The Changes button displays the diff between the image and the selected version.
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
As far as I can tell, the history/changes still shows the differences between the selected versions and not the image. Regards, Gary ----- Original Message ----- From: "Lukas Renggli" <renggli@gmail.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 1:38 PM Subject: Re: [Pharo-project] request for the new merge tool :)
may be the first step would be to add back the install menu items.
These are definitely crucial for being able to cherry pick changes from different versions.
Now for browsing the changes in the squeak trunk we should find a way to select only change between two versions and even using the history button I could not exactly get what I wanted. Lukas did you succeed to do this kind of operation?
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
The Changes button displays the diff between the image and the selected version.
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
On Sep 8, 2009, at 5:19 PM, Gary Chambers wrote:
As far as I can tell, the history/changes still shows the differences between the selected versions and not the image.
I'm not sure in fact :)
Regards, Gary
----- Original Message ----- From: "Lukas Renggli" <renggli@gmail.com> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 1:38 PM Subject: Re: [Pharo-project] request for the new merge tool :)
may be the first step would be to add back the install menu items.
These are definitely crucial for being able to cherry pick changes from different versions.
Now for browsing the changes in the squeak trunk we should find a way to select only change between two versions and even using the history button I could not exactly get what I wanted. Lukas did you succeed to do this kind of operation?
Yes, this is what the History button is supposed to do, display the diff between two arbitrary versions.
The Changes button displays the diff between the image and the selected version.
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
participants (9)
-
Alexandre Bergel -
Damien Cassou -
Gary Chambers -
Lukas Renggli -
Mariano Martinez Peck -
Michael Roberts -
rkrock＠locksleycreeksoftware.com -
Simon Denier -
Stéphane Ducasse