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