Smalltalk › Pharo › Pharo Smalltalk Developers

request for the new merge tool :)

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

29 messages Options

Gary Chambers-4

Re: request for the new merge tool :)

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" <[hidden email]>
To: <[hidden email]>
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
> [hidden email]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

_______________________________________________
Pharo-project mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

Gary Chambers-4

Re: request for the new merge tool :)

In reply to this post by Stéphane Ducasse

Would be great to decide on the UI we want then make MC play ball...

Regards, Gary

----- Original Message -----
From: "Stéphane Ducasse" <[hidden email]>
To: <[hidden email]>
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, [hidden email] 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.html
>>>
>>> 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
>>> [hidden email]
>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>>>
>>
>>
>>
>>
>>
>> _______________________________________________
>> Pharo-project mailing list
>> [hidden email]
>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>
>
> _______________________________________________
> Pharo-project mailing list
> [hidden email]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

_______________________________________________
Pharo-project mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

Stéphane Ducasse

Re: request for the new merge tool :)

In reply to this post by Gary Chambers-4

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" <[hidden email]>
> To: <[hidden email]>
> 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
>> [hidden email]
>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>
>
> _______________________________________________
> Pharo-project mailing list
> [hidden email]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

_______________________________________________
Pharo-project mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

Stéphane Ducasse

Re: request for the new merge tool :)

In reply to this post by Gary Chambers-4

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" <[hidden email]>
> To: <[hidden email]>
> 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, [hidden email] 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.html
>>>>
>>>> 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
>>>> [hidden email]
>>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>>>>
>>>
>>>
>>>
>>>
>>>
>>> _______________________________________________
>>> Pharo-project mailing list
>>> [hidden email]
>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>>
>>
>> _______________________________________________
>> Pharo-project mailing list
>> [hidden email]
>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>
>
> _______________________________________________
> Pharo-project mailing list
> [hidden email]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

_______________________________________________
Pharo-project mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

Gary Chambers-4

Re: request for the new merge tool :)

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" <[hidden email]>
To: <[hidden email]>
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.

_______________________________________________
Pharo-project mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

_______________________________________________
Pharo-project mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

Stéphane Ducasse

Re: 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" <[hidden email]>
> To: <[hidden email]>
> 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" <[hidden email]>
>> To: <[hidden email]>
>> 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, [hidden email] 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.html
>>>>>
>>>>> 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
>>>>> [hidden email]
>>>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-
>>>>> project
>>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>> _______________________________________________
>>>> Pharo-project mailing list
>>>> [hidden email]
>>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>>>
>>>
>>> _______________________________________________
>>> Pharo-project mailing list
>>> [hidden email]
>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>>
>>
>> _______________________________________________
>> Pharo-project mailing list
>> [hidden email]
>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>
>
> _______________________________________________
> Pharo-project mailing list
> [hidden email]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>
>
> _______________________________________________
> Pharo-project mailing list
> [hidden email]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

_______________________________________________
Pharo-project mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

Gary Chambers-4

Re: request for the new merge tool :)

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" <[hidden email]>
To: <[hidden email]>
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

Stéphane Ducasse

Re: 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" <[hidden email]>
> To: <[hidden email]>
> 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" <[hidden email]>
>> To: <[hidden email]>
>> 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" <[hidden email]>
>>> To: <[hidden email]>
>>> 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, [hidden email] 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.html
>>>>>>
>>>>>> 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
>>>>>> [hidden email]
>>>>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-
>>>>>> project
>>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> _______________________________________________
>>>>> Pharo-project mailing list
>>>>> [hidden email]
>>>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-
>>>>> project
>>>>
>>>>
>>>> _______________________________________________
>>>> Pharo-project mailing list
>>>> [hidden email]
>>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>>>
>>>
>>> _______________________________________________
>>> Pharo-project mailing list
>>> [hidden email]
>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>>
>>
>> _______________________________________________
>> Pharo-project mailing list
>> [hidden email]
>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>>
>>
>> _______________________________________________
>> Pharo-project mailing list
>> [hidden email]
>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>
>
> _______________________________________________
> Pharo-project mailing list
> [hidden email]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>
>
> _______________________________________________
> Pharo-project mailing list
> [hidden email]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

_______________________________________________
Pharo-project mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

Gary Chambers-4

Re: request for the new merge tool :)

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" <[hidden email]>
To: <[hidden email]>
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