[Pharo-project] request for the new merge tool :)

Stéphane Ducasse stephane.ducasse at inria.fr
Tue Sep 8 12:47:58 EDT 2009


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





More information about the Pharo-dev mailing list