Is the merge tool broken in 30126?
Because I cannot merge my fix 10735 to understand the conflicts ;( the merge tools does not show up. I will see how I can recover my work because I spent some hours on it. Stef
apparently it is broken when I enable FT2 So I removed it and it works. Stef On Jun 25, 2013, at 10:39 AM, Stéphane Ducasse <Stephane.Ducasse@inria.fr> wrote:
Because I cannot merge my fix 10735 to understand the conflicts ;( the merge tools does not show up. I will see how I can recover my work because I spent some hours on it.
Stef
strange, I have freetype enabled by default and I don't have problems, are you mergning stuff with utf-8 characters? :P On 2013-06-25, at 10:59, Stéphane Ducasse <stephane.ducasse@inria.fr> wrote:
apparently it is broken when I enable FT2
So I removed it and it works.
Stef
On Jun 25, 2013, at 10:39 AM, Stéphane Ducasse <Stephane.Ducasse@inria.fr> wrote:
Because I cannot merge my fix 10735 to understand the conflicts ;( the merge tools does not show up. I will see how I can recover my work because I spent some hours on it.
Stef
On Jun 25, 2013, at 11:01 AM, Camillo Bruni <camillobruni@gmail.com> wrote:
strange, I have freetype enabled by default and I don't have problems, are you mergning stuff with utf-8 characters? :P
Can you try my slice :) Because I thought the same but on my machine it is endless. Stef
apparently it is broken when I enable FT2
So I removed it and it works.
Stef
On Jun 25, 2013, at 10:39 AM, Stéphane Ducasse <Stephane.Ducasse@inria.fr> wrote:
Because I cannot merge my fix 10735 to understand the conflicts ;( the merge tools does not show up. I will see how I can recover my work because I spent some hours on it.
Stef
On 2013-06-25, at 11:06, Stéphane Ducasse <stephane.ducasse@inria.fr> wrote:
On Jun 25, 2013, at 11:01 AM, Camillo Bruni <camillobruni@gmail.com> wrote:
strange, I have freetype enabled by default and I don't have problems, are you mergning stuff with utf-8 characters? :P
Can you try my slice :) Because I thought the same but on my machine it is endless.
no problem here, so maybe you have a strange font you use by default ;)
On Jun 25, 2013, at 11:08 AM, Camillo Bruni <camillobruni@gmail.com> wrote:
On 2013-06-25, at 11:06, Stéphane Ducasse <stephane.ducasse@inria.fr> wrote:
On Jun 25, 2013, at 11:01 AM, Camillo Bruni <camillobruni@gmail.com> wrote:
strange, I have freetype enabled by default and I don't have problems, are you mergning stuff with utf-8 characters? :P
Can you try my slice :) Because I thought the same but on my machine it is endless.
no problem here, so maybe you have a strange font you use by default ;)
I just took the latest image and StartupLoader default executeAtomicItems: { StartupAction name: 'Settings' code: [ "Skip the integration path (So everything works there without noise)" ('.' asFileReference fullName beginsWith: '/Users/ducasse/Workspace/FirstCircle/ActiveResearch/Pharo/PharoHarvestingFixes/30/Integration') ifFalse: [ Author fullName: 'StephaneDucasse'. CodeHolder showAnnotationPane: true. Deprecation raiseWarning: true. SHPreferences setStyleTableNamed: 'Tango'. Debugger alwaysOpenFullDebugger: true. PolymorphSystemSettings showDesktopLogo: false. FreeTypeSystemSettings loadFt2Library: true. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ] ] runOnce: true. }. So I will not use FreeType
participants (2)
-
Camillo Bruni -
Stéphane Ducasse