From Ben.Ross@scisys.co.uk Mon Aug 4 09:58:57 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id B9201765A3 for ; Mon, 4 Aug 2014 09:58:57 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: YES X-Spam-Score: 2.333 X-Spam-Level: ** X-Spam-Status: Yes, score=2.333 tagged_above=-999 required=2 tests=[BAYES_95=3, HTML_MESSAGE=0.001, MIME_QP_LONG_LINE=0.001, RP_MATCHES_RCVD=-0.668, SPF_PASS=-0.001] autolearn=no Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ndVB5WDv21Wg for ; Mon, 4 Aug 2014 09:58:56 +0000 (UTC) X-Greylist: delayed 1057 seconds by postgrey-1.34 at restaurant.gnome.org; Mon, 04 Aug 2014 09:58:55 UTC Received: from mx1.scisys.co.uk (mx1.scisys.co.uk [31.221.15.139]) by restaurant.gnome.org (Postfix) with ESMTP id F3E6B760A7 for ; Mon, 4 Aug 2014 09:58:45 +0000 (UTC) Received: from mx-met-owa1.scisys.co.uk ([10.224.16.8]) by mx1.scisys.co.uk with Microsoft SMTPSVC(7.5.7601.17514); Mon, 4 Aug 2014 10:41:05 +0100 X-PMWin-Version: 3.1.1.0, Antivirus-Engine: 3.51.1, Antivirus-Data: 5.04 Received: from mx-met-exch1.scisys.co.uk ([10.224.16.22]) by mx-met-owa1.scisys.co.uk with Microsoft SMTPSVC(6.0.3790.4675); Mon, 4 Aug 2014 10:41:05 +0100 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.3790.4913 Content-Class: urn:content-classes:message MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----_=_NextPart_001_01CFAFC8.35DF46CF" Subject: RE: Ignore first lines of a files Date: Mon, 4 Aug 2014 10:40:59 +0100 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: Ignore first lines of a files thread-index: Ac+K+j5xIJSZYv3JRP6t0MH+2iJysgkzWu4w References: <0c5334c61c674d138b68649e8b45a810@AM2PR04MB0641.eurprd04.prod.outlook.com> From: "Ben Ross" To: X-OriginalArrivalTime: 04 Aug 2014 09:41:05.0061 (UTC) FILETIME=[35F51D50:01CFAFC8] Disclaimer: scisys.co.uk X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Aug 2014 09:58:57 -0000 This is a multi-part message in MIME format. ------_=_NextPart_001_01CFAFC8.35DF46CF Content-Type: text/plain;charset="us-ascii" Content-Transfer-Encoding: quoted-printable Disclaimer: scisys.co.uk Try something like ^\s*Date=3D.*;$ Sorry I'm on the wrong computer to actually test it. __________________________________________________________________ Ben Ross SCISYS UK Limited. Registered in England and Wales No. 4373530.=0ARegistered= Office: Methuen Park, Chippenham, Wiltshire SN14 0GB, UK.=0A =0ABefore prin= ting, please think about the environment. ------_=_NextPart_001_01CFAFC8.35DF46CF Content-Type: text/html;charset="us-ascii" Content-Transfer-Encoding: quoted-printable Disclaimer: scisys.co.uk

Try something l= ike

 

^\s*Date=3D.*;$

 

Sorry I= 217;m on the wrong computer to actually test it.

 

<= span style=3D'font-size:10.0pt;font-family:"Arial","sans-serif";color:#7A2B2= E;mso-fareast-language:EN-GB'>______________________________________________= ____________________


Ben Ross

<= gfidisc.scisys.co.uk/>

 

=0A
SCISYS UK Limited. Register= ed in England and Wales No. 4373530.
=0A
Regis= tered Office: Methuen Park, Chippenham, Wiltshire SN14 0GB, UK.
= =0A
 
=0A
Before printing, = please think about the environment= .

------_=_NextPart_001_01CFAFC8.35DF46CF-- From david.t.kerns@gmail.com Mon Aug 4 15:44:43 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id B32AC760A1 for ; Mon, 4 Aug 2014 15:44:43 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tKo9c8LBm47Q for ; Mon, 4 Aug 2014 15:44:41 +0000 (UTC) Received: from mail-oi0-f50.google.com (mail-oi0-f50.google.com [209.85.218.50]) by restaurant.gnome.org (Postfix) with ESMTP id 959C0769C5 for ; Mon, 4 Aug 2014 15:44:31 +0000 (UTC) Received: by mail-oi0-f50.google.com with SMTP id a141so4688563oig.9 for ; Mon, 04 Aug 2014 08:44:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=QrqAp4htlGJJq9mGr+epaTZgLzt6ZtaTwUYjJr3U6bc=; b=rDfiRvvPqiP//zgtvrMJ7AMWryBuowb+cttrTm50eyjRP/rVgcTOttuYuY3+8EP5EB +Yt9RDp8p4R3a2t5DLrob+6YQhMd5YBwWwm9rvVR/w2anbsPXFzraYnY+qlKf35ZOil4 0AAk3wIy7G9xGCCnebSGdQxYJU9qp9q1dOJEBPO6MhqPdS4Cmv+GReXFaWr6Chgye7Se oC9DbgoMjeuPotfnhKiffHybxdu22GJkgzsAFc1KNAWJ+KnBrQBmXTaQxtXlJ/uSb5K7 kx8QDArOviKs3YeBgDvMFIWG20o5n+Vf4eT3H3xF81bpvmUcKqDanwOstCJCplbMM4if lwsQ== MIME-Version: 1.0 X-Received: by 10.182.20.115 with SMTP id m19mr1211982obe.22.1407167069610; Mon, 04 Aug 2014 08:44:29 -0700 (PDT) Received: by 10.60.70.180 with HTTP; Mon, 4 Aug 2014 08:44:29 -0700 (PDT) In-Reply-To: <0c5334c61c674d138b68649e8b45a810@AM2PR04MB0641.eurprd04.prod.outlook.com> References: <0c5334c61c674d138b68649e8b45a810@AM2PR04MB0641.eurprd04.prod.outlook.com> Date: Mon, 4 Aug 2014 08:44:29 -0700 Message-ID: Subject: Re: Ignore first lines of a files From: david kerns To: Dennis Decoene Content-Type: multipart/alternative; boundary=001a11330c6e52ea2504ffcf9d6b Cc: "meld-list@gnome.org" X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Aug 2014 15:44:43 -0000 --001a11330c6e52ea2504ffcf9d6b Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable there nothing in regex to fear ... and now days, help is ubiquitous ... I (well, google) found this in 0.32 seconds : http://regexone.com/ On Wed, Jun 18, 2014 at 6:46 AM, Dennis Decoene wrote: > Hello! > > > > I=E2=80=99m using Meld for the first time to do a rather large merge (abo= ut 5000 > text files) for a Microsoft Dynamics Nav upgrade. > > > > So far I=E2=80=99m having a wonderfull time using meld. However, all the = files > start with a couple of lines I can safely ignore but meld of course notes > the differences. If the could be left out of the comparison, I would not > have to open each file only to find that only the lines in the =E2=80=98h= eader=E2=80=99 > have been updated, saving me a lot of time. > > > > An example: > > > > OBJECT Table 5075 Logged Segment > > { > > OBJECT-PROPERTIES > > { > > Date=3D24/07/01; > > Time=3D12:00:00; > > Version List=3DNAVW13.01; > > } > > PROPERTIES > > { > > CaptionML=3D[ENU=3DLogged Segment; > > FRB=3DSegment journalis=E2=80=9A; > > NLB=3DGeregistreerd segment]; > > LookupFormID=3DForm5139; > > } > > FIELDS > > { > > (=E2=80=A6. Continues) > > > > You see, the lines =E2=80=98Date=3D=E2=80=A6=E2=80=99, =E2=80=98Time=3D= =E2=80=A6=E2=80=99 and =E2=80=98Version List=3D=E2=80=A6=E2=80=99 can be ig= nored, > but how do you do that in Meld 1.8.5? I know i can with the tekst filters > but cannot seem to find the right regex to do it (I=E2=80=99ve been strug= gling with > regex for the past 20 years=E2=80=A6) > > > > Thank you for your help! > > > > Dennis > > > > _______________________________________________ > meld-list mailing list > meld-list@gnome.org > https://mail.gnome.org/mailman/listinfo/meld-list > --001a11330c6e52ea2504ffcf9d6b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
there nothing in regex to fear ... and now days, help is u= biquitous ... I (well, google) found this in=C2=A0<= span style=3D"font-family:arial,sans-serif;line-height:43px;white-space:now= rap">0.32 seconds=C2=A0: =C2=A0http://regexone.com/=C2=A0


On Wed, Jun 1= 8, 2014 at 6:46 AM, Dennis Decoene <Dennis.Decoene@esc.be> wrote:

Hello!

=C2=A0

I=E2=80=99m using Meld for the first time to do a ra= ther large merge (about 5000 text files) for a Microsoft Dynamics Nav upgra= de.

=C2=A0

So far I=E2=80=99m having a wonderfull time using me= ld. However, all the files start with a couple of lines I can safely ignore= but meld of course notes the differences. If the could be left out of the = comparison, I would not have to open each file only to find that only the lines in the =E2=80=98header=E2=80=99 have= been updated, saving me a lot of time.

=C2=A0

An example:

=C2=A0

OBJECT Table 5075 Logged Segment

{

=C2=A0 OBJECT-PROPERTIES

=C2=A0 {

=C2=A0=C2=A0=C2=A0 Date=3D24/07/01;

=C2=A0=C2=A0=C2=A0 Time=3D12:00:00;

=C2=A0=C2=A0=C2=A0 Version List=3DNAVW13.01;<= u>

=C2=A0 }

=C2=A0 PROPERTIES

=C2=A0 {

=C2=A0=C2=A0=C2=A0 CaptionML=3D[ENU=3DLogged Segment= ;

=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 FRB=3DSegment journalis=E2=80=9A;<= u>

=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 NLB=3DGeregistreerd segment];

=C2=A0=C2=A0=C2=A0 LookupFormID=3DForm5139;

=C2=A0 }

=C2=A0 FIELDS

=C2=A0 {

(=E2=80=A6. Continues)

=C2=A0

You see, the lines =E2=80=98Date=3D=E2=80=A6=E2=80= =99, =E2=80=98Time=3D=E2=80=A6=E2=80=99 and =E2=80=98Version List=3D=E2=80= =A6=E2=80=99 can be ignored, but how do you do that in Meld 1.8.5? I know i= can with the tekst filters but cannot seem to find the right regex to do i= t (I=E2=80=99ve been struggling with regex for the past 20 years=E2=80=A6)

=C2=A0

Thank you for your help!

<= font color=3D"#888888">

=C2=A0

Dennis=C2=A0

=C2=A0


_______________________________________________
meld-list mailing list
meld-list@gnome.org
https://mail.gnome.org/mailman/listinfo/meld-list
=

--001a11330c6e52ea2504ffcf9d6b-- From appanasandeep@gmail.com Tue Aug 5 05:22:18 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id AEF02769D4 for ; Tue, 5 Aug 2014 05:22:18 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gzSoQdWIJlCz for ; Tue, 5 Aug 2014 05:22:17 +0000 (UTC) Received: from mail-ig0-f175.google.com (mail-ig0-f175.google.com [209.85.213.175]) by restaurant.gnome.org (Postfix) with ESMTP id A1B1976974 for ; Tue, 5 Aug 2014 05:22:02 +0000 (UTC) Received: by mail-ig0-f175.google.com with SMTP id uq10so6504941igb.2 for ; Mon, 04 Aug 2014 22:22:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:content-type; bh=O/Ag5INrPhINOvE75dtVtisLRQzUb8n6PmQrHW2x7x0=; b=feBF61AfdUET1XwVh5nlOTnGjT4yHMxu7/dWBnwKhHgnVFVXudq0WOosoTPBLAVeR+ jMk7NQjsiFY0mYnXlMgVTULbABurziD6JcxanmVLOsdPEhJI1DFkM9sX0Qv+pl/Pl3/8 sAQS8Uh59bbLl+I/xgyQGOZ7/wEADdvIfXirK+WwJnRdeauHRoSvh1q3USoJ0pc2GcLZ uIcymumwPqfJluPYABkLn/W6YpB4gNO0dADrSlCWj7E2f5I1RCmI6djTl9RYxycB7vJq gZG6Pn5ligiyS81NRYg6rOux7IQC5mxlBgHMaI495iZUUMMCYD2pNz/lTalaBSYvbAtm 60QQ== X-Received: by 10.50.25.71 with SMTP id a7mr43151918igg.17.1407216121469; Mon, 04 Aug 2014 22:22:01 -0700 (PDT) MIME-Version: 1.0 Received: by 10.64.133.2 with HTTP; Mon, 4 Aug 2014 22:21:40 -0700 (PDT) From: sandeep appana Date: Tue, 5 Aug 2014 10:51:40 +0530 Message-ID: Subject: Solution to resolve Line Formatting issue in MELD To: meld-list@gnome.org Content-Type: multipart/alternative; boundary=047d7bd74a1c0adf7104ffdb099f X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Aug 2014 05:22:18 -0000 --047d7bd74a1c0adf7104ffdb099f Content-Type: text/plain; charset=UTF-8 Hi All, I am using MELD for quite some time and found it very useful for resolving my conflicts using this. However, i find some issue while resolving few conflicted files, MELD prompts for an Warning Message to choose for the correct Line formatting, Windows Line Formatting or UNIX Line Formatting. If I choose as UNIX Line Formatting (as my dev environment is in LINUX), the file is shown as completely changed in my version control and if i commit the same, all my history changes for the file is lost. Is there a way by which we can merge without prompting for this error message (or) is there a way by which we can preserve the history of the file after changing this formatting 2) I could see the following Feature added as part of MELD 3.11.1 - Added a prompt to mark a conflict as resolved from file comparison (Kai Willadsen) I am using MELD 1.8.6 and is this feature available in it ? Where can i actually find this option while resolving conflicts Regards, Sandeep. --047d7bd74a1c0adf7104ffdb099f Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi All,

I am using MELD for quite some = time and found it very useful for resolving my conflicts using this.
<= div>
However, i find some issue while resolving few conflicte= d files,
MELD prompts for an Warning Message to choose for the correct Line for= matting, Windows Line Formatting or UNIX Line Formatting.
If I ch= oose as UNIX Line Formatting (as my dev environment is in LINUX), the file = is shown as completely changed in my version control and if i commit the sa= me, all my history changes for the file is lost.
Is there a way by which we can merge without prompting for this error = message (or) is there a way by which we can preserve the history of the fil= e after changing this formatting


2) I could see the following Feature added as part of MELD 3.11.1
  • Added a prompt= to mark a conflict as resolved from file comparison (Kai Willadsen)
    • I am using MELD 1.8.6 and is this feature available in it ?
    Where can i actually find this option while resolving conflicts
    <= div>
    Regards,
    Sandeep.

    --047d7bd74a1c0adf7104ffdb099f-- From kai.willadsen@gmail.com Thu Aug 7 20:49:23 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 1ECFD769A3 for ; Thu, 7 Aug 2014 20:49:23 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id utp2EskZtYWJ for ; Thu, 7 Aug 2014 20:49:22 +0000 (UTC) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by restaurant.gnome.org (Postfix) with ESMTP id 3A20D763ED for ; Thu, 7 Aug 2014 20:49:11 +0000 (UTC) Received: by mail-wg0-f50.google.com with SMTP id n12so4574113wgh.21 for ; Thu, 07 Aug 2014 13:49:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=w3XrPpmcRVeGCuolRPwEJyzlXiGwwaOa7xvP2BAaqQw=; b=CMJX8NVirzzCmljVeTPyatv2FEm6pHGkcrTF5GcVG8M3hvzsaeXcZWzG6Xed28W5SP IwUPia9ekA/seTaDJMRp5sRyX10enTM9lkjKV+OmUuCpZdxH2b1/KbchPb31dxBHYWDR O4LaF23G9m9mviEAslXiiYvDtefF2pn6DcP49ybMca99lq2k+8E6/3GqLy70hyJvq76m J2p7egU1/DZeKbgUNBg9x/D56eISzzD2nCEx5CoSnorfp6XpyXvfXSqXuKl+9xvPmm5D ugsEGG5bf9qeuyrMjh5E3C+c4U4XCJNoc+ivl2YGujH/bb8WpuVs8kOnbsy3rwfga1vF wBCA== MIME-Version: 1.0 X-Received: by 10.180.149.163 with SMTP id ub3mr61515253wib.67.1407444549685; Thu, 07 Aug 2014 13:49:09 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Thu, 7 Aug 2014 13:49:09 -0700 (PDT) In-Reply-To: References: <1406240752-4016-1-git-send-email-egore911@gmail.com> Date: Fri, 8 Aug 2014 06:49:09 +1000 Message-ID: Subject: Re: [PATCH] Drop unused RoundRobinScheduler From: Kai Willadsen To: Christoph Brill Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Aug 2014 20:49:23 -0000 On 1 August 2014 07:14, Christoph Brill wrote: > Hi Kai, > > find the patch attached. Pushed, thanks. Kai From kai.willadsen@gmail.com Thu Aug 7 20:55:32 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 5334F769A3 for ; Thu, 7 Aug 2014 20:55:32 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7lDTVio8qV83 for ; Thu, 7 Aug 2014 20:55:31 +0000 (UTC) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by restaurant.gnome.org (Postfix) with ESMTP id BD614763ED for ; Thu, 7 Aug 2014 20:55:19 +0000 (UTC) Received: by mail-wi0-f173.google.com with SMTP id f8so18814wiw.0 for ; Thu, 07 Aug 2014 13:55:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=WLyENqY5uVBEIw+IAM67CaPTd/P5CJVvm6CRq6tcRBA=; b=lXQTAYcP1Vwci7JD/sY7CxX8VjUnmvORfbbbTA2xrdc7hqf12agrWH7DkvziHi8Xpv /9k9CEM9CA42+hFNfZFNrh2AxSEajxYWIWpiB01odSGbiaOpf/8OVI8gkRcgw/Kq98Se 8+eLf3xICo40pAS8yIa1t+99Sn0g8QTBxZOvfOeAQA7kVLccl4d/rGjusx7Zlul4NxcY 3272MXD1pMzmcTzOa8xaEi+g2Poxu3y79CrepUTxuglgOYHh2H8Mt0tzlyTquUfXnPXo rc80vTnDSf6p2iiJopLUobtNpPPXG4WvD9GCNP8pA/me46KutszBjY4QybHFlEMzI1yn 3Z/A== MIME-Version: 1.0 X-Received: by 10.180.11.135 with SMTP id q7mr26974047wib.67.1407444918267; Thu, 07 Aug 2014 13:55:18 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Thu, 7 Aug 2014 13:55:18 -0700 (PDT) In-Reply-To: References: <1406397672-12777-1-git-send-email-egore911@gmail.com> Date: Fri, 8 Aug 2014 06:55:18 +1000 Message-ID: Subject: Re: [PATCH] Handle dummy_toolbar_diffmap the same way as dummy_toolbar_linkmap From: Kai Willadsen To: Christoph Brill Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Aug 2014 20:55:32 -0000 On 1 August 2014 07:08, Christoph Brill wrote: > Hi Kai, > > I was using "git send-email" to create the e-mail message. It is possible to > apply these using "git am", but for convenience reasons I can also attach > them (as done with this e-mail). Cheers. I usually use gmail as a client, and it makes a straight git am incredibly painful. Anyway, pushed. Thanks. Kai From kai.willadsen@gmail.com Thu Aug 7 20:58:10 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id EF3BC769A3 for ; Thu, 7 Aug 2014 20:58:10 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YaU0CHC0OFyN for ; Thu, 7 Aug 2014 20:58:09 +0000 (UTC) Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by restaurant.gnome.org (Postfix) with ESMTP id 97323763ED for ; Thu, 7 Aug 2014 20:57:58 +0000 (UTC) Received: by mail-wg0-f47.google.com with SMTP id b13so4581033wgh.6 for ; Thu, 07 Aug 2014 13:57:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=wm/Bd0oVKx2V8Tat6Erep1HriEPAmmEJ717iAcr4mQ4=; b=CpwJRksnZz6TktgTKu5fs5HZhU5q9vp1En8zPB+Q7U1ijTY6jQgL4AMFugHWXDTQSv YhLUTTwHwB0rP2S2KSuVr2O+twqPcVLIoFza8r6S/9H2HwjjKPaxJhiDkLFkTlddZH4/ 3Ypzh76+Yro6uGhUzpaeOOsyx2WYkEnZrIl1HyQk1Fns3HYLcoKc30XF/5CXvlA8Ecy0 120cp1qhRZ7Nj9S9hXWJ9aItZ1BdOUVV0zeQH1jtOM1zj/9WG2KizG4GW6Nyk0NvsE4D rRuyYXdjiJcLY9ayy1cSZD2pApM2z5xBZxmJtIiisphEjIAgoWSLbA5bC5i35X46mSAo 7NTA== MIME-Version: 1.0 X-Received: by 10.180.184.99 with SMTP id et3mr62435042wic.31.1407445077308; Thu, 07 Aug 2014 13:57:57 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Thu, 7 Aug 2014 13:57:57 -0700 (PDT) In-Reply-To: References: Date: Fri, 8 Aug 2014 06:57:57 +1000 Message-ID: Subject: Re: User issue From: Kai Willadsen To: Emanuel Jianu Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Aug 2014 20:58:11 -0000 On 25 July 2014 19:03, Emanuel Jianu wrote: > > All, > > Is this a good place to discuss Meld user issues? If not please direct me to the correct discussion group.. > > On a Solaris box Meld appears to use strange characters (picture included below). > > The value of LANG variable appears to be irrelevant. I have tried with LANG=en_US and LANG=en_US.UTF-8. I haven't seen this one before, and I would have guessed that there were some people running Meld on Solaris. Do other GTK applications show similar behaviour, or is it just Meld? Also, could you post the output of `locale`? cheers, Kai From kai.willadsen@gmail.com Fri Aug 8 22:19:54 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 721A476A26 for ; Fri, 8 Aug 2014 22:19:54 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 29RtfQZYHbPG for ; Fri, 8 Aug 2014 22:19:53 +0000 (UTC) Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by restaurant.gnome.org (Postfix) with ESMTP id 4F84776239 for ; Fri, 8 Aug 2014 22:19:42 +0000 (UTC) Received: by mail-wi0-f177.google.com with SMTP id ho1so1675785wib.10 for ; Fri, 08 Aug 2014 15:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=+ft9m3go0M2hnpFedUjAvee9aLPPvhnKee9gg1s7l1o=; b=Y4Zo6sc33dHHkG2ylrKblqI0iM5nb/FNtcsVo256HYYDTBFMXLKKwiuIx/ask/wGbO geJPJd14hYlczRnh1SkCFH03iBrenkJWkxgSiLuhgqy7HvJsyK/FayDgG9tK9mMoQAjb PILcV6dHHSTuL1i0/4hq+wSDdV//mQi5GeRVmVTjWHCjyra/PrsBVrAhjV5vstjUxQk6 254664jQIcV1nXvhJlvTdNMaWyFkU6z2U13xfLlpNkNEi2YtSFx2bp4xutIb5w31BDP3 /k0v1v0RDWxGBGC6RZIIc6h3pA19cFkh0sOYKsZ+Iv1p50Hu6dVrmOnx+YMFx2AXPoID aKIQ== MIME-Version: 1.0 X-Received: by 10.194.104.234 with SMTP id gh10mr35807287wjb.66.1407536380974; Fri, 08 Aug 2014 15:19:40 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Fri, 8 Aug 2014 15:19:40 -0700 (PDT) In-Reply-To: References: Date: Sat, 9 Aug 2014 08:19:40 +1000 Message-ID: Subject: Re: Solution to resolve Line Formatting issue in MELD From: Kai Willadsen To: sandeep appana Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Aug 2014 22:19:54 -0000 On 5 August 2014 15:21, sandeep appana wrote: > Hi All, > > I am using MELD for quite some time and found it very useful for resolving > my conflicts using this. > > However, i find some issue while resolving few conflicted files, > MELD prompts for an Warning Message to choose for the correct Line > formatting, Windows Line Formatting or UNIX Line Formatting. > If I choose as UNIX Line Formatting (as my dev environment is in LINUX), the > file is shown as completely changed in my version control and if i commit > the same, all my history changes for the file is lost. > Is there a way by which we can merge without prompting for this error > message (or) is there a way by which we can preserve the history of the file > after changing this formatting I'm sorry, but I don't understand the question here. It sounds like you just chose the wrong line formatting? > 2) I could see the following Feature added as part of MELD 3.11.1 > > Added a prompt to mark a conflict as resolved from file comparison (Kai > Willadsen) > > I am using MELD 1.8.6 and is this feature available in it ? > Where can i actually find this option while resolving conflicts This is only in 3.1.1, and it's automatic. cheers, Kai From kai.willadsen@gmail.com Fri Aug 8 22:22:13 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id B4C66769B2 for ; Fri, 8 Aug 2014 22:22:13 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gQCHpxHKr8_a for ; Fri, 8 Aug 2014 22:22:12 +0000 (UTC) Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by restaurant.gnome.org (Postfix) with ESMTP id 3A78376239 for ; Fri, 8 Aug 2014 22:22:01 +0000 (UTC) Received: by mail-wg0-f51.google.com with SMTP id b13so6151428wgh.10 for ; Fri, 08 Aug 2014 15:21:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=o+Dwcgqgd+980hetvzxYD3Yrq2VdluE2CCF70gpVyt8=; b=AQN8RdelgkuEXnKcFjVfOIGIJeELUc7j+2hKt/OUyixBzr2MfHU5imQaDBAfcIzgjj 5v25qA3MDEk6vQCRL34Rcc1XsGUrg0xsAWbEj9eNnw9sRaxBlLvP1uqjFDl17Zxb95Fy kB1ATjnyg1RUJ0hnC23YrXSaqBU8QP41VH2Js04DdSLFOqVjx5KysAWsupqWYwfFO7Kn nSvTd8QpHy14OL4wic9dfiWMOhZXaHAhtyBi7GiSPn8ASulQtZbi2J/8ktuboKJfCMES 7OBN8UWajFy2W72Doz67p/XP7tZhpSa/84wG+5zf8/tyHb/opqWIzGtZy3a5fOjKh1MZ JZoA== MIME-Version: 1.0 X-Received: by 10.180.12.38 with SMTP id v6mr1428116wib.31.1407536519908; Fri, 08 Aug 2014 15:21:59 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Fri, 8 Aug 2014 15:21:59 -0700 (PDT) In-Reply-To: <53CFEE16.5050907@verisilicon.com> References: <20140723140019.135b6431431ee96072436ecd@hoevendesign.com> <53CFEE16.5050907@verisilicon.com> Date: Sat, 9 Aug 2014 08:21:59 +1000 Message-ID: Subject: Re: compare code block(s) From: Kai Willadsen To: Adam Krolnik Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Aug 2014 22:22:13 -0000 On 24 July 2014 03:17, Adam Krolnik wrote: > > How about having meld be able to detect the movement of blocks of code and > show those differences. > > I.e. for two files > > a b > > blk1 blk2 > blk2 blk1 > > Meld could report a movement rather than one deletion (in file a) and one > addition (in file b). I've wanted to try something like this for ages, but (a) it's hard and (b) the UI would probably be a nightmare. Not saying it wouldn't be useful, but it's a long way down the list. cheers, Kai From kai.willadsen@gmail.com Fri Aug 8 22:24:50 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 3379C769B2 for ; Fri, 8 Aug 2014 22:24:50 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g4KNtNur6dFm for ; Fri, 8 Aug 2014 22:24:49 +0000 (UTC) Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by restaurant.gnome.org (Postfix) with ESMTP id 0FF3D769FE for ; Fri, 8 Aug 2014 22:24:38 +0000 (UTC) Received: by mail-wg0-f42.google.com with SMTP id l18so6082710wgh.13 for ; Fri, 08 Aug 2014 15:24:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=YhSDf56V7+tcSca0kXoe+2QCktQaDjPoPjGbLNpZrjU=; b=Qo6OKR5M2m2rP/zwSFUMkVJyZE7QyXBLM1Ia1xsnR6mZlUFCsaFbsdI8wEjl6CUb89 XeI94429jvJeeCHUWw5wrycd9Plij51Njs8VY88bRbw+uCrZtDKca11xsDOBWKsWqy8l b9FI4bmZa4GRMY216aDH4zl4TcuzJUMIBt20Ij+a1VybgaOl+rqGS/+7Eqsh8gtf7bLE ovqCx2JDiPezz9kKQx0Vq9flDnKIc+2iDpt/EJL7wNf20rcGTku5XBfBkxnleeNzamQG YLa/WacpBjbuSHnoXi2d4CMF9A4mYv/tRHmbFVBBiQaJ9Kd6POuIGZsFP9CnPhdl2XyJ TriQ== MIME-Version: 1.0 X-Received: by 10.180.184.99 with SMTP id et3mr1477553wic.31.1407536676588; Fri, 08 Aug 2014 15:24:36 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Fri, 8 Aug 2014 15:24:36 -0700 (PDT) In-Reply-To: References: <20140723140019.135b6431431ee96072436ecd@hoevendesign.com> Date: Sat, 9 Aug 2014 08:24:36 +1000 Message-ID: Subject: Re: compare code block(s) From: Kai Willadsen To: david kerns Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Aug 2014 22:24:50 -0000 On 24 July 2014 01:59, david kerns wrote: > ... ultil they implement a "sync point" ... > > I've been able to "help" meld do this by (temporary) inserting some unique > text ( e.g. '%%%&&&%%%') in both files ... some times you have to save and > reload too Meld has sync point support already, and has for the last year. Unfortunately we have to disabled interactive highlighting while it's enabled for irritating performance reasons. This is definitely fixable, but turned out to be hard. cheers, Kai From adam.krolnik@verisilicon.com Fri Aug 8 22:27:34 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id F35B4769FE for ; Fri, 8 Aug 2014 22:27:33 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.844 X-Spam-Level: X-Spam-Status: No, score=-1.844 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, HTML_MESSAGE=0.001, MIME_HTML_ONLY=0.723, RP_MATCHES_RCVD=-0.668] autolearn=no Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xouFCmm1AHgG for ; Fri, 8 Aug 2014 22:27:32 +0000 (UTC) Received: from ironport.verisilicon.com (mail-ctc.verisilicon.com [116.246.14.109]) by restaurant.gnome.org (Postfix) with ESMTP id 1ACE8769B2 for ; Fri, 8 Aug 2014 22:27:21 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.01,827,1399996800"; d="scan'208,217";a="4301470" Received: from shasxm08.verisilicon.com ([10.10.0.81]) by ironport.verisilicon.com with ESMTP; 09 Aug 2014 06:27:18 +0800 Received: from [10.10.56.156] (10.10.56.156) by SHASXM08.verisilicon.com (10.10.0.83) with Microsoft SMTP Server (TLS) id 14.1.289.1; Sat, 9 Aug 2014 06:27:18 +0800 Message-ID: <53E54EC3.7030204@verisilicon.com> Date: Fri, 8 Aug 2014 17:27:15 -0500 From: Adam Krolnik User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Kai Willadsen Subject: Re: compare code block(s) References: <20140723140019.135b6431431ee96072436ecd@hoevendesign.com> <53CFEE16.5050907@verisilicon.com> In-Reply-To: X-Enigmail-Version: 1.6 Content-Type: text/html; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.10.56.156] Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Aug 2014 22:27:34 -0000
    It appears that git diff has a some new difference algorithm options that may be interesting to try out.

    On 08/08/2014 05:21 PM, Kai Willadsen wrote:
    On 24 July 2014 03:17, Adam Krolnik <adam.krolnik@verisilicon.com> wrote:

    How about having meld be able to detect the movement of blocks of code and
show those differences.

I.e. for two files

a               b

blk1            blk2
blk2            blk1

Meld could report a movement rather than one deletion (in file a) and one
addition (in file b).

    I've wanted to try something like this for ages, but (a) it's hard and
(b) the UI would probably be a nightmare. Not saying it wouldn't be
useful, but it's a long way down the list.

cheers,
Kai


    -- 
    Soli Deo Gloria
    Adam Krolnik
    Director of Design Verification
    VeriSilicon Inc.
    Plano TX. 75074
    Co-author "Assertion-Based Design", "Creating Assertion-Based IP"
    From adam.krolnik@verisilicon.com Fri Aug 8 22:28:32 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id D5C40769FE for ; Fri, 8 Aug 2014 22:28:32 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.844 X-Spam-Level: X-Spam-Status: No, score=-1.844 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, HTML_MESSAGE=0.001, MIME_HTML_ONLY=0.723, RP_MATCHES_RCVD=-0.668] autolearn=no Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 88zRguEgUKjf for ; Fri, 8 Aug 2014 22:28:31 +0000 (UTC) Received: from ironport.verisilicon.com (mail-ctc.verisilicon.com [116.246.14.109]) by restaurant.gnome.org (Postfix) with ESMTP id 7CD1A769B2 for ; Fri, 8 Aug 2014 22:28:20 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.01,827,1399996800"; d="scan'208,217";a="4301473" Received: from shasxm08.verisilicon.com ([10.10.0.81]) by ironport.verisilicon.com with ESMTP; 09 Aug 2014 06:28:19 +0800 Received: from [10.10.56.156] (10.10.56.156) by SHASXM08.verisilicon.com (10.10.0.83) with Microsoft SMTP Server (TLS) id 14.1.289.1; Sat, 9 Aug 2014 06:28:18 +0800 Message-ID: <53E54EFF.1010005@verisilicon.com> Date: Fri, 8 Aug 2014 17:28:15 -0500 From: Adam Krolnik User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Subject: Re: compare code block(s) References: <20140723140019.135b6431431ee96072436ecd@hoevendesign.com> In-Reply-To: X-Enigmail-Version: 1.6 Content-Type: text/html; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.10.56.156] X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Aug 2014 22:28:32 -0000
    Is this only in the 3.x series ? I have not seen it in the 1.x


    On 08/08/2014 05:24 PM, Kai Willadsen wrote:
    On 24 July 2014 01:59, david kerns <david.t.kerns@gmail.com> wrote:

    ... ultil they implement a "sync point" ...

I've been able to "help" meld do this by (temporary) inserting some unique
text ( e.g. '%%%&&&%%%') in both files ... some times you have to save and
reload too

    Meld has sync point support already, and has for the last year.
Unfortunately we have to disabled interactive highlighting while it's
enabled for irritating performance reasons. This is definitely
fixable, but turned out to be hard.

cheers,
Kai
_______________________________________________
meld-list mailing list
meld-list@gnome.org
https://mail.gnome.org/mailman/listinfo/meld-list


    -- 
    Soli Deo Gloria
    Adam Krolnik
    Director of Design Verification
    VeriSilicon Inc.
    Plano TX. 75074
    Co-author "Assertion-Based Design", "Creating Assertion-Based IP"
    From kai.willadsen@gmail.com Fri Aug 8 22:31:01 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id BB5A1769B2 for ; Fri, 8 Aug 2014 22:31:01 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u2jxL0bcRQZK for ; Fri, 8 Aug 2014 22:31:00 +0000 (UTC) Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by restaurant.gnome.org (Postfix) with ESMTP id 846CB76239 for ; Fri, 8 Aug 2014 22:30:49 +0000 (UTC) Received: by mail-wg0-f44.google.com with SMTP id m15so6161679wgh.15 for ; Fri, 08 Aug 2014 15:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=Cx80WG/DnFQqPTF/G42BrrCU1RE2zrRBQjL1zWcZ0UM=; b=PT+BDyGSpzHWLxhDq6QsEP0blz9jyzSPkWURlqB7vR9BplalT2uDpFU61lewA0zXHJ kOIYqLJH8JyL1mtCRyRxcXuiNMjOXXvIzokWeSz7tZVJx2/J6KPuwcIa4vL3QNz7STSw 1BbzNNl8oUS4QK4NWiOuaBfUCyYYZgybhghvC1yDejtTUy3R+y87+qlmgZPkIxB/xEa6 SQnmsOeLEFgUz9iyeda+hXoew4/fU4vdAetDXTcPbp5qeHqLYOeHL0rRlzQ9pFU4kWfj 1AFSxlLTcc8QgRVpvsAnT7RPkCJve09BEywrTaBy4zeFws1gyCdpPEJlKI5oE4Et/MB7 uJ6Q== MIME-Version: 1.0 X-Received: by 10.180.149.163 with SMTP id ub3mr7128245wib.67.1407537048306; Fri, 08 Aug 2014 15:30:48 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Fri, 8 Aug 2014 15:30:48 -0700 (PDT) In-Reply-To: <53E54EFF.1010005@verisilicon.com> References: <20140723140019.135b6431431ee96072436ecd@hoevendesign.com> <53E54EFF.1010005@verisilicon.com> Date: Sat, 9 Aug 2014 08:30:48 +1000 Message-ID: Subject: Re: compare code block(s) From: Kai Willadsen To: Adam Krolnik Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Aug 2014 22:31:01 -0000 On 9 August 2014 08:28, Adam Krolnik wrote: > > Is this only in the 3.x series ? I have not seen it in the 1.x It was first added in 1.7.2. cheers, Kai From kai.willadsen@gmail.com Fri Aug 8 23:32:36 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 46F0E76A26 for ; Fri, 8 Aug 2014 23:32:36 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MGyiRP6qqaXz for ; Fri, 8 Aug 2014 23:32:34 +0000 (UTC) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by restaurant.gnome.org (Postfix) with ESMTP id 3E6FC769FE for ; Fri, 8 Aug 2014 23:32:23 +0000 (UTC) Received: by mail-wi0-f170.google.com with SMTP id f8so3187718wiw.1 for ; Fri, 08 Aug 2014 16:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=wABBK2C/40TA1U/SJfNzJcdl7SDJN5Q1LoKebXbaDEo=; b=RZ7JN0bN6SFhY3/fvvXB6CXzbx43Ma3eLfeCRSesHOx2dXkrOU2+4yrqWqqCY0dzkk MEL/TAd3CSw+I6qNXHWMYtidcS9CWOPCOwmuLamGf1j6xi9H9HuSxKynfgLZYrWKop9o NTggWnfLk2VnAJ8DBk28qSLX2g9No4xP9jTcUxk9C4wnNH+ke99PrPMO97QmzSdwGCsp ZpdAwWOkErBwx+6N2gBzafzoTAfqFxv7tqOARiMvmIPLcfyzmXpvYgQJTgPhN6vAksnl 7xgEJNYbRify76Qx9aJBuVJjbK9muqjMZSxvi+dLvoba3rzsxyQ6sU6rt4OZIa2NiCLc AiGA== MIME-Version: 1.0 X-Received: by 10.180.184.99 with SMTP id et3mr1747348wic.31.1407540741767; Fri, 08 Aug 2014 16:32:21 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Fri, 8 Aug 2014 16:32:21 -0700 (PDT) In-Reply-To: <1401794896-31257-1-git-send-email-polynomial-c@gentoo.org> References: <1401794896-31257-1-git-send-email-polynomial-c@gentoo.org> Date: Sat, 9 Aug 2014 09:32:21 +1000 Message-ID: Subject: Re: [PATCH] Add missing/incomplete "Language" entries or else msgfmt from gettext-0.19 fails (see Gentoo bug #512222 - https://bugs.gentoo.org/512222) From: Kai Willadsen To: Lars Wendler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Aug 2014 23:32:36 -0000 I've pushed this to current master. Thanks for the patch cheers, Kai On 3 June 2014 21:28, Lars Wendler wrote: > Signed-off-by: Lars Wendler > --- > po/ar.po | 1 + > po/ca@valencia.po | 1 + > po/dz.po | 1 + > po/en_CA.po | 1 + > po/en_GB.po | 1 + > po/eo.po | 1 + > po/es.po | 2 +- > po/fr.po | 1 + > po/ko.po | 1 + > po/nb.po | 2 +- > po/ne.po | 1 + > po/nl.po | 1 + > po/oc.po | 1 + > po/pa.po | 1 + > po/pt.po | 1 + > po/ro.po | 1 + > po/rw.po | 1 + > po/sq.po | 1 + > po/vi.po | 1 + > po/zh_TW.po | 1 + > 20 files changed, 20 insertions(+), 2 deletions(-) > > diff --git a/po/ar.po b/po/ar.po > index 87b6697..8551f73 100644 > --- a/po/ar.po > +++ b/po/ar.po > @@ -11,6 +11,7 @@ msgstr "" > "PO-Revision-Date: 2007-04-14 18:49+0100\n" > "Last-Translator: Djihed Afifi \n" > "Language-Team: Arabeyes \n" > +"Language: ar\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/ca@valencia.po b/po/ca@valencia.po > index a0fd18f..5d096f8 100644 > --- a/po/ca@valencia.po > +++ b/po/ca@valencia.po > @@ -14,6 +14,7 @@ msgstr "" > "PO-Revision-Date: 2009-06-25 21:51+0200\n" > "Last-Translator: David Planella \n" > "Language-Team: Catalan \n" > +"Language: ca@valencia\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/dz.po b/po/dz.po > index 6554f2f..1ae6bc1 100644 > --- a/po/dz.po > +++ b/po/dz.po > @@ -11,6 +11,7 @@ msgstr "" > "PO-Revision-Date: 2006-12-18 23:14+0530\n" > "Last-Translator: Jurmey Rabgay \n" > "Language-Team: dzongkha \n" > +"Language: dz\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3Dutf-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/en_CA.po b/po/en_CA.po > index f1057a9..6327ded 100644 > --- a/po/en_CA.po > +++ b/po/en_CA.po > @@ -12,6 +12,7 @@ msgstr "" > "PO-Revision-Date: 2005-06-23 16:51-0400\n" > "Last-Translator: Adam Weinberger \n" > "Language-Team: Canadian English \n" > +"Language: en_CA\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/en_GB.po b/po/en_GB.po > index 32d0046..cecccdf 100644 > --- a/po/en_GB.po > +++ b/po/en_GB.po > @@ -12,6 +12,7 @@ msgstr "" > "PO-Revision-Date: 2007-01-23 20:55-0000\n" > "Last-Translator: David Lodge \n" > "Language-Team: \n" > +"Language: en_GB\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/eo.po b/po/eo.po > index d8ab53a..3c7f9ab 100644 > --- a/po/eo.po > +++ b/po/eo.po > @@ -12,6 +12,7 @@ msgstr "" > "PO-Revision-Date: 2012-02-25 10:34+0100\n" > "Last-Translator: Kristjan SCHMIDT \n" > "Language-Team: Esperanto \n" > +"Language: eo\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/es.po b/po/es.po > index 51bdbfc..fdb105c 100644 > --- a/po/es.po > +++ b/po/es.po > @@ -17,7 +17,7 @@ msgstr "" > "PO-Revision-Date: 2014-04-15 17:18+0200\n" > "Last-Translator: Daniel Mustieles \n" > "Language-Team: Espa=C3=B1ol \n" > -"Language: \n" > +"Language: es\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/fr.po b/po/fr.po > index 64108f3..12383ad 100644 > --- a/po/fr.po > +++ b/po/fr.po > @@ -17,6 +17,7 @@ msgstr "" > "PO-Revision-Date: 2012-04-15 16:49+0200\n" > "Last-Translator: Bruno Brouard \n" > "Language-Team: GNOME French Team \n" > +"Language: fr\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/ko.po b/po/ko.po > index 2020a63..ad80151 100644 > --- a/po/ko.po > +++ b/po/ko.po > @@ -12,6 +12,7 @@ msgstr "" > "PO-Revision-Date: 2007-11-26 16:54+0900\n" > "Last-Translator: Namhyung Kim \n" > "Language-Team: GNOME Korean \n" > +"Language: ko\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: UTF-8\n" > diff --git a/po/nb.po b/po/nb.po > index 486494a..e7877f4 100644 > --- a/po/nb.po > +++ b/po/nb.po > @@ -10,7 +10,7 @@ msgstr "" > "PO-Revision-Date: 2012-02-04 13:15+0100\n" > "Last-Translator: Kjartan Maraas \n" > "Language-Team: Norwegian/Bokmaal \n" > -"Language: \n" > +"Language: nb\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/ne.po b/po/ne.po > index bb7f5eb..3f19e3f 100644 > --- a/po/ne.po > +++ b/po/ne.po > @@ -16,6 +16,7 @@ msgstr "" > "PO-Revision-Date: 2007-11-14 16:00+0545\n" > "Last-Translator: Shyam Krishna Bal \n" > "Language-Team: Nepali \n" > +"Language: ne\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/nl.po b/po/nl.po > index b5263f1..f011516 100644 > --- a/po/nl.po > +++ b/po/nl.po > @@ -11,6 +11,7 @@ msgstr "" > "PO-Revision-Date: 2005-09-24 01:54+0200\n" > "Last-Translator: Tino Meinen \n" > "Language-Team: Dutch \n" > +"Language: nl\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/oc.po b/po/oc.po > index 6d6a097..28bf998 100644 > --- a/po/oc.po > +++ b/po/oc.po > @@ -12,6 +12,7 @@ msgstr "" > "PO-Revision-Date: 2008-06-11 13:40+0200\n" > "Last-Translator: Yannig Marchegay (Kokoyaya) \n" > "Language-Team: Occitan \n" > +"Language: oc\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/pa.po b/po/pa.po > index 6e7233f..271c43f 100644 > --- a/po/pa.po > +++ b/po/pa.po > @@ -11,6 +11,7 @@ msgstr "" > "PO-Revision-Date: 2005-06-24 16:51+0530\n" > "Last-Translator: Amanpreet Singh Alam \n" > "Language-Team: Punjabi \n" > +"Language: pa\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/pt.po b/po/pt.po > index 4278bd8..b075b94 100644 > --- a/po/pt.po > +++ b/po/pt.po > @@ -11,6 +11,7 @@ msgstr "" > "PO-Revision-Date: 2003-12-24 02:40+0000\n" > "Last-Translator: Duarte Loreto \n" > "Language-Team: Portuguese \n" > +"Language: pt\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/ro.po b/po/ro.po > index 53e61b3..03049fe 100644 > --- a/po/ro.po > +++ b/po/ro.po > @@ -12,6 +12,7 @@ msgstr "" > "PO-Revision-Date: 2011-01-02 15:31+0200\n" > "Last-Translator: Cosmin Clapon \n" > "Language-Team: Romanian \n" > +"Language: ro\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/rw.po b/po/rw.po > index 68b5684..01cc380 100644 > --- a/po/rw.po > +++ b/po/rw.po > @@ -19,6 +19,7 @@ msgstr "" > "PO-Revision-Date: 2005-03-31 20:55-0700\n" > "Last-Translator: Steve Murphy \n" > "Language-Team: Kinyarwanda \= n" > +"Language: rw\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/sq.po b/po/sq.po > index 5b1de75..abb090e 100644 > --- a/po/sq.po > +++ b/po/sq.po > @@ -14,6 +14,7 @@ msgstr "" > "PO-Revision-Date: 2009-11-13 23:26+0200\n" > "Last-Translator: Besnik Bleta \n" > "Language-Team: Albanian \n" > +"Language: sq\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/vi.po b/po/vi.po > index f90ea57..94d141c 100644 > --- a/po/vi.po > +++ b/po/vi.po > @@ -12,6 +12,7 @@ msgstr "" > "PO-Revision-Date: 2012-02-12 19:32+0700\n" > "Last-Translator: Tr=C6=B0=C6=A1ng =E1=BB=A8ng Minh \n" > "Language-Team: Vietnamese \n" > +"Language: vi\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3Dutf-8\n" > "Content-Transfer-Encoding: 8bit\n" > diff --git a/po/zh_TW.po b/po/zh_TW.po > index bae12c4..e3db780 100644 > --- a/po/zh_TW.po > +++ b/po/zh_TW.po > @@ -11,6 +11,7 @@ msgstr "" > "PO-Revision-Date: 2005-06-25 20:32+0800\n" > "Last-Translator: Woodman Tuen \n" > "Language-Team: Chinese/Traditional \n" > +"Language: zh_TW\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=3DUTF-8\n" > "Content-Transfer-Encoding: 8bit\n" > -- > 2.0.0 > > _______________________________________________ > meld-list mailing list > meld-list@gnome.org > https://mail.gnome.org/mailman/listinfo/meld-list From ejianu@gmail.com Tue Aug 12 12:16:38 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 3141B769DE for ; Tue, 12 Aug 2014 12:16:38 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PabfyuLSngoj for ; Tue, 12 Aug 2014 12:16:36 +0000 (UTC) Received: from mail-oa0-f45.google.com (mail-oa0-f45.google.com [209.85.219.45]) by restaurant.gnome.org (Postfix) with ESMTP id 9E20A769D3 for ; Tue, 12 Aug 2014 12:16:25 +0000 (UTC) Received: by mail-oa0-f45.google.com with SMTP id i7so7208912oag.32 for ; Tue, 12 Aug 2014 05:16:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=zUnjRKybGEal/GSAUGro4zHLoZ6gtK1781/H7Uy8re8=; b=KIgK4TBxNmgqitZQx2MBFNedH98ck9o51huNgniEnYmxl6UBN2+jdvSiYt5SkGtpWg OYfwEZMGvW7KcoVt8g5HQM8mhES4cMQRLopED65/cZlUd/rkZ5mSxngURHxEgYgdLKPP ZZGV/OLX9uKWp804oYWpQ2ubSgwXrfUdeX2bwNQDkO+zTzksBUsIcj9lN4U6whJ4xXlW zvrkZJkFNDHb+h/Y6LVtlY2GW5A1G91BRBbiVVCrIBD8KqnZlUgIzcqYeQqp3L2xLB2s LC5OueizxcMW/kJUCWPNiVlaXXNkPELQHss6plspFTkQK6/43fstmtfT8aGSSMCcK1t/ HmBw== X-Received: by 10.182.97.168 with SMTP id eb8mr4291404obb.60.1407845784512; Tue, 12 Aug 2014 05:16:24 -0700 (PDT) MIME-Version: 1.0 Received: by 10.76.182.35 with HTTP; Tue, 12 Aug 2014 05:16:04 -0700 (PDT) In-Reply-To: References: From: Emanuel Jianu Date: Tue, 12 Aug 2014 15:16:04 +0300 Message-ID: Subject: Re: User issue To: Kai Willadsen Content-Type: multipart/alternative; boundary=047d7b2e41e6e27e4b05006da33b Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Aug 2014 12:16:38 -0000 --047d7b2e41e6e27e4b05006da33b Content-Type: text/plain; charset=UTF-8 Hi Kai, Below is the output of `locale` for when I use default locale, LANG=en_US and LANG=en_US.UTF-8. Also including the warnings I get when starting Meld. Unfortunately there are no other apps using GTK on the machine and I cannot tell if Meld is the only tool behaving this way. user@machine:/opt/meld-1.8.4>/opt/csw/bin/meld ** (process:2893): WARNING **: Trying to register gtype 'GMountMountFlags' as enum when in fact it is of type 'GFlags' ** (process:2893): WARNING **: Trying to register gtype 'GDriveStartFlags' as enum when in fact it is of type 'GFlags' ** (process:2893): WARNING **: Trying to register gtype 'GSocketMsgFlags' as enum when in fact it is of type 'GFlags' /opt/csw/lib/python2.6/site-packages/gobject/__init__.py:115: Warning: attempting to add an interface (GtkEditable) to class (HistoryFileEntry) after class_init type_register(cls, namespace.get('__gtype_name__')) failed to find gam_server Failed to connect to socket /tmp/fam-user/fam- (meld:2893): GLib-GIO-WARNING **: FAMOpen failed, FAMErrno=3 Fontconfig error: "/etc/opt/csw/fontconfig/conf.d/10-scale-bitmap-fonts.conf", line 70: non-double matrix element Fontconfig error: "/etc/opt/csw/fontconfig/conf.d/10-scale-bitmap-fonts.conf", line 70: non-double matrix element Fontconfig warning: "/etc/opt/csw/fontconfig/conf.d/10-scale-bitmap-fonts.conf", line 78: saw unknown, expected number failed to find gam_server Failed to connect to socket /tmp/fam-user/fam- (meld:2893): GLib-GIO-WARNING **: FAMOpen failed, FAMErrno=3 user@machine:/opt/meld-1.8.4>locale LANG= LC_CTYPE="C" LC_NUMERIC="C" LC_TIME="C" LC_COLLATE="C" user@machine:/opt/meld-1.8.4>export LANG=en_US user@machine:/opt/meld-1.8.4>locale LANG=en_US LC_CTYPE="en_US" LC_NUMERIC="en_US" LC_TIME="en_US" LC_COLLATE="en_US" LC_MONETARY="en_US" LC_MESSAGES="en_US" LC_ALL= user@machine:/opt/meld-1.8.4>export LANG=en_US.UTF-8 user@machine:/opt/meld-1.8.4>locale LANG=en_US.UTF-8 LC_CTYPE="en_US.UTF-8" LC_NUMERIC="en_US.UTF-8" LC_TIME="en_US.UTF-8" LC_COLLATE="en_US.UTF-8" LC_MONETARY="en_US.UTF-8" LC_MESSAGES="en_US.UTF-8" LC_ALL= On Thu, Aug 7, 2014 at 11:57 PM, Kai Willadsen wrote: > On 25 July 2014 19:03, Emanuel Jianu wrote: > > > > All, > > > > Is this a good place to discuss Meld user issues? If not please direct > me to the correct discussion group.. > > > > On a Solaris box Meld appears to use strange characters (picture > included below). > > > > The value of LANG variable appears to be irrelevant. I have tried with > LANG=en_US and LANG=en_US.UTF-8. > > I haven't seen this one before, and I would have guessed that there > were some people running Meld on Solaris. Do other GTK applications > show similar behaviour, or is it just Meld? Also, could you post the > output of `locale`? > > cheers, > Kai > -- Best regards, Emanuel Jianu --047d7b2e41e6e27e4b05006da33b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
    Hi Kai,

    Below is the output = of=C2=A0`locale` for when I use default locale, LANG=3Den_US and=C2=A0LANG= =3Den_US.UTF-8. Also including the warnings I get when starting Meld. Unfor= tunately there are no other apps using GTK on the machine and I cannot tell= if Meld is the only tool behaving this way.

    user@machine:/opt/meld-1.8.4>/opt/csw/bin/meld

    ** (process:2893): WARNING **: Trying to register g= type 'GMountMountFlags' as enum when in fact it is of type 'GFl= ags'

    ** (process:2893): WARNING **: Trying to register gtype= 'GDriveStartFlags' as enum when in fact it is of type 'GFlags&= #39;

    ** (process:2893): WARNING **: Trying to regi= ster gtype 'GSocketMsgFlags' as enum when in fact it is of type = 9;GFlags'
    /opt/csw/lib/python2.6/site-packages/gobject/__init__.py:115: Warning:= attempting to add an interface (GtkEditable) to class (HistoryFileEntry) a= fter class_init
    =C2=A0 type_register(cls, namespace.get('__gt= ype_name__'))
    failed to find gam_server
    Failed to connect to socket /tmp/f= am-user/fam-

    (meld:2893): GLib-GIO-WARNING **: FAM= Open failed, FAMErrno=3D3

    Fontconfig error: "= /etc/opt/csw/fontconfig/conf.d/10-scale-bitmap-fonts.conf", line 70: n= on-double matrix element
    Fontconfig error: "/etc/opt/csw/fontconfig/conf.d/10-scale-bitmap= -fonts.conf", line 70: non-double matrix element
    Fontconfig = warning: "/etc/opt/csw/fontconfig/conf.d/10-scale-bitmap-fonts.conf&qu= ot;, line 78: saw unknown, expected number
    failed to find gam_server
    Failed to connect to socket /tmp/f= am-user/fam-

    (meld:2893): GLib-GIO-WARNING **: FAM= Open failed, FAMErrno=3D3

    user@machine:/opt/meld-1= .8.4>locale
    LANG=3D
    LC_CTYPE=3D"C"
    LC_NUM= ERIC=3D"C"
    LC_TIME=3D"C"
    LC_COLLATE= =3D"C"

    user@machine:/opt/meld-1.8.= 4>export LANG=3Den_US
    user@machine:/opt/meld-1.8.4>locale
    LANG=3Den_= US
    LC_CTYPE=3D"en_US"
    LC_NUMERIC=3D"en_U= S"
    LC_TIME=3D"en_US"
    LC_COLLATE=3D"= en_US"
    LC_MONETARY=3D"en_US"
    LC_MESSAGES=3D"en_US&qu= ot;
    LC_ALL=3D

    user@machine:/opt/me= ld-1.8.4>export =C2=A0LANG=3Den_US.UTF-8
    user@machine= :/opt/meld-1.8.4>locale
    LANG=3Den_US.UTF-8
    LC_CTYPE=3D"en_US.UTF-8"<= /div>
    LC_NUMERIC=3D"en_US.UTF-8"
    LC_TIME=3D"en= _US.UTF-8"
    LC_COLLATE=3D"en_US.UTF-8"
    LC= _MONETARY=3D"en_US.UTF-8"
    LC_MESSAGES=3D"en_US.UTF-8"
    LC_ALL=3D
    <= div>



    On Thu, Aug 7, 2014 at 11:57 PM, Kai Willadsen <kai.willadsen@gmail.com> wrote:
    On 25 July 2014 19:03, Emanu= el Jianu <ejianu@gmail.com> w= rote:
    >
    > All,
    >
    > Is this a good place to discuss Meld user issues? If not please direct= me to the correct discussion group..
    >
    > On a Solaris box Meld appears to use strange characters (picture inclu= ded below).
    >
    > The value of LANG variable appears to be irrelevant. I have tried with= LANG=3Den_US and LANG=3Den_US.UTF-8.

    I haven't seen this one before, and I would have guessed that the= re
    were some people running Meld on Solaris. Do other GTK applications
    show similar behaviour, or is it just Meld? Also, could you post the
    output of `locale`?

    cheers,
    Kai



    --
    Best regards,
    Emanuel Jianu

    = =C2=A0= =C2=A0=C2=A0
    --047d7b2e41e6e27e4b05006da33b-- From kai.willadsen@gmail.com Sat Aug 23 04:51:13 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 237DB769B4 for ; Sat, 23 Aug 2014 04:51:13 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wFiqy5s-o5-9 for ; Sat, 23 Aug 2014 04:51:11 +0000 (UTC) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by restaurant.gnome.org (Postfix) with ESMTP id 82A4176974 for ; Sat, 23 Aug 2014 04:51:00 +0000 (UTC) Received: by mail-wi0-f180.google.com with SMTP id n3so465339wiv.13 for ; Fri, 22 Aug 2014 21:50:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=10VzlotwvvWxc4Kzw8sWYc8Iy3K8KgYiCARMYtVNYbk=; b=VBrOxb6yEP+p2UWrgwTSoo3JYgRoWTAEAJR4qvm+nOEZPsyMP4d54LkVVnKxhCbOTY 4tBnd65/hbJXpz/5xQzyEUut3OT2hPvr/YoSndUl7JVzd2HZQF+lYiJJHxGpm/aYWn34 /Z2wuIMyhIbHH6qS200KB1Bih10QaUNzCM97Cm/x++2zdvC365BV0yyKvA6qjN7StMiY RSBfo1+96XMfeLapQzbfZ87wpBv7vS1OQXyTNfj+/QPz1PHc3AdvvFojX/lUkqt2NKEa fYs1ARZYSrAIO2vfvAAIUJG2ZcZjwbnyzjrurMRz08wv+YTGK+u1F02l6bgu6p7RgzdO HI4g== MIME-Version: 1.0 X-Received: by 10.194.118.232 with SMTP id kp8mr9183249wjb.42.1408769459000; Fri, 22 Aug 2014 21:50:59 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Fri, 22 Aug 2014 21:50:58 -0700 (PDT) Date: Sat, 23 Aug 2014 14:50:58 +1000 Message-ID: Subject: Meld 3.11.3 From: Kai Willadsen To: meld-list Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2014 04:51:13 -0000 Meld 3.11.3 has been released, and is now available at: http://download.gnome.org/sources/meld/3.11/meld-3.11.3.tar.xz Features -------- * Manually handle app menu fallback for non-Gnome shells (Kai Willadsen) * Save and restore window maximisation state (Kai Willadsen) Fixes ----- * Add missing/incomplete "Language" entries (Lars Wendler) * Miscellaneous code cleanups (Christoph Brill) * Handle broken locale settings better (Kai Willadsen) * Fix size allocation issues in preferences UI (Kai Willadsen) * Update shebang for environments with Python 3 as default (Kai Willadsen) Translations ------------ * Daniel Mustieles (es) * Marek =C4=8Cernock=C3=BD (cs) * Piotr Dr=C4=85g (pl) * Rafael Ferreira (pt_BR) What is Meld? ------------- Meld is a visual diff and merge tool. It lets you compare two or three file= s, and updates the comparisons while you edit them in-place. You can also comp= are folders, launching comparisons of individual files as desired. Last but by = no means least, Meld lets you work with your current changes in a wide variety= of version control systems, including Git, Bazaar, Mercurial and Subversion. From kai.willadsen@gmail.com Sat Aug 23 04:57:45 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id B645476974 for ; Sat, 23 Aug 2014 04:57:45 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FlCCV-FlRPuO for ; Sat, 23 Aug 2014 04:57:44 +0000 (UTC) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by restaurant.gnome.org (Postfix) with ESMTP id 88C3F764BC for ; Sat, 23 Aug 2014 04:57:33 +0000 (UTC) Received: by mail-wi0-f173.google.com with SMTP id f8so470486wiw.12 for ; Fri, 22 Aug 2014 21:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=5v6PVYYnB04XZyCCqE1q0S1TWc1WMhvNuXMGgrJK0rs=; b=if1s9JYkMAVOhC8lC2kdhtB+7ddSgBqcUJ+8omhacrAxZ4ggjG0hNobYnUBXEfPayS eoycUNgA6R/C7VuqLvrPeAufa6YnF4lnD17TF+qBwoyxTHJs5dD0O/xq8SOImKEl7ruI 7VNDCzsPwO3Ve4bDRJz/n00aErJ7PG5QxlMVQXRrMPvUbQhQd0zw2L7VQVlzE8ylHO2a 6t6lhUWWfk34cOMUAt1drbFT2xxh19JTMk4yn61Dig9PQ9X2z4bf9Bo1nkoCA3iU+8Ri F6TxRdYweDIqJfO8ccDk7u6gAe0Q1svzEQFLNPyn7kpLQphiYt/srFAmPDdHhB9QEnF+ lA8g== MIME-Version: 1.0 X-Received: by 10.180.184.99 with SMTP id et3mr2290499wic.31.1408769852011; Fri, 22 Aug 2014 21:57:32 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Fri, 22 Aug 2014 21:57:31 -0700 (PDT) Date: Sat, 23 Aug 2014 14:57:31 +1000 Message-ID: Subject: Release plans From: Kai Willadsen To: meld-list Content-Type: text/plain; charset=UTF-8 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2014 04:57:45 -0000 Hi all, I'm hoping that the just-released 3.11.3 is the last 3.11.x release. If no *major* problems arise, 3.12 will be coming soon. I am painfully aware that I didn't get a 3.11.2 release of the MSI out; I will hopefully do one for 3.11.3 in the next few days. For the 3.13 series, we'll have the move to GtkSourceView-based incremental find (which is really much nicer) and maybe a few other minor features. I'm hoping to get time for better handling of dark themes (mostly done) and a proper per-file UI for encoding selection. In the unlikely event of spare time, 3.14 may also contain a port to Python 3, since that's basically done already. If anyone has pet features (or bugs) they'd like to contribute patches for, now is a good time! cheers, Kai From kai.willadsen@gmail.com Sat Aug 23 22:22:16 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id BC745765AC for ; Sat, 23 Aug 2014 22:22:16 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZoX98mOdE0vi for ; Sat, 23 Aug 2014 22:22:15 +0000 (UTC) Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) by restaurant.gnome.org (Postfix) with ESMTP id 78BA8762E7 for ; Sat, 23 Aug 2014 22:22:04 +0000 (UTC) Received: by mail-wg0-f48.google.com with SMTP id x13so11663737wgg.31 for ; Sat, 23 Aug 2014 15:22:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=nrdvGsT/onOZIgXND8C3pI3a60gZzl+Q+gEZzpQRN9I=; b=nzlnSKUdBWPLimXFeAh1tOiRsy3SwqhBu66L0/Hy//u0vl/ePBPpilu47rAt9iPabx LxH0MPoeShjcrwsVMjIeIhfUFNz/Oe0XBlehh5S6wrT8Z20sce9deVqJ2WG0LMTH0zNG Y1R0lRmMQFlewW5LwVmUI1kFQKlFUMCukqHjHlIauEbisfeI82Cj/Jh2hcZOCLqO6k9C 9in7awUq/RnQPh5SYnbnL1kVHbWV13iFmUKeg5K6mYI7q2GBrh734EfMG3xNXG3LXCjB tna+1kD9bv3ncmdnu60GM8cnqi258FcwdGafgnTLDqpQ8p5xZNfDjANJ4lefBkNv3WuP p9tg== MIME-Version: 1.0 X-Received: by 10.181.13.116 with SMTP id ex20mr6038155wid.31.1408832522785; Sat, 23 Aug 2014 15:22:02 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Sat, 23 Aug 2014 15:22:02 -0700 (PDT) In-Reply-To: References: Date: Sun, 24 Aug 2014 08:22:02 +1000 Message-ID: Subject: Re: Meld 3.11.3 From: Kai Willadsen To: meld-list Content-Type: text/plain; charset=UTF-8 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2014 22:22:16 -0000 On 23 August 2014 14:50, Kai Willadsen wrote: > Meld 3.11.3 has been released, and is now available at: > http://download.gnome.org/sources/meld/3.11/meld-3.11.3.tar.xz Windows binaries are now available at: https://download.gnome.org/binaries/win32/meld/3.11/Meld-3.11.3-win32.msi cheers, Kai From kai.willadsen@gmail.com Sat Aug 23 22:26:23 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 7ACEC765AC for ; Sat, 23 Aug 2014 22:26:23 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VKtu6oSUF5Gs for ; Sat, 23 Aug 2014 22:26:22 +0000 (UTC) Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by restaurant.gnome.org (Postfix) with ESMTP id 45C86762E7 for ; Sat, 23 Aug 2014 22:26:11 +0000 (UTC) Received: by mail-wi0-f171.google.com with SMTP id hi2so1048668wib.4 for ; Sat, 23 Aug 2014 15:26:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=1ab48yGA1WEHx1KhEcmDxt58Ov2lgf5Gd1+D2hcqmhQ=; b=eR46kw1q04llgWWffKJnQGUCifcgcf5bHyRmHoFYIwv4KnFxikd/QHhCcirfiyCYT8 E5wnM+74dkm3ZGn21qPrsW3vvmVsSHS3g0kL1ZJE2N/TqeGWTryTPlUeds1TsJ0Bd8wl hFgrMChfiwW2vMp4aiZJA1wS78g8F91HxeUJO5oSSJG+p9fxA6yXqfc2FzzaCoyivr+a fxSCvfgaDbSzuaKkp9wJfiEcc83RZZ89uhijZZWgJoIceFd8urLyoJjqN9vLsQJ9H7TT YOmLLEHh7hbvHsy1etm25fFgqscT+SX2RGkEBovm051kY2X1aTltGmtXDdMNwWFgCW/K hNgg== MIME-Version: 1.0 X-Received: by 10.180.94.34 with SMTP id cz2mr5949775wib.74.1408832769918; Sat, 23 Aug 2014 15:26:09 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Sat, 23 Aug 2014 15:26:09 -0700 (PDT) In-Reply-To: References: Date: Sun, 24 Aug 2014 08:26:09 +1000 Message-ID: Subject: Re: User issue From: Kai Willadsen To: Emanuel Jianu Content-Type: multipart/alternative; boundary=f46d04426c52cc8dc705015370d2 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2014 22:26:23 -0000 --f46d04426c52cc8dc705015370d2 Content-Type: text/plain; charset=UTF-8 On 12 August 2014 22:16, Emanuel Jianu wrote: > Hi Kai, > > Below is the output of `locale` for when I use default locale, LANG=en_US > and LANG=en_US.UTF-8. Also including the warnings I get when starting Meld. > Unfortunately there are no other apps using GTK on the machine and I cannot > tell if Meld is the only tool behaving this way. > Sorry, but I'm at a bit of a loss here. There are plenty of fun errors there, but I can't really help you resolve them. > /opt/csw/lib/python2.6/site-packages/gobject/__init__.py:115: Warning: > attempting to add an interface (GtkEditable) to class (HistoryFileEntry) > after class_init > type_register(cls, namespace.get('__gtype_name__')) > IIRC, this is an actual problem to do with a specific version of GLib, resolved in a minor update. It's been a while since I saw this, but either way it's not an actual problem with Meld. > Fontconfig error: > "/etc/opt/csw/fontconfig/conf.d/10-scale-bitmap-fonts.conf", line 70: > non-double matrix elementFontconfig error: > "/etc/opt/csw/fontconfig/conf.d/10-scale-bitmap-fonts.conf", line 70: > non-double matrix element > Fontconfig warning: > "/etc/opt/csw/fontconfig/conf.d/10-scale-bitmap-fonts.conf", line 78: saw > unknown, expected number > This is almost certainly the actual cause of your glyph corruption. It's been a long, long time since I had to mess with fontconfig however, so I don't have any real suggestions. cheers, Kai --f46d04426c52cc8dc705015370d2 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
    On 1= 2 August 2014 22:16, Emanuel Jianu <ejianu@gmail.com> wrote:<= br>
    Hi Kai,

    Below is the output = of=C2=A0`locale` for when I use default locale, LANG=3Den_US and=C2=A0LANG= =3Den_US.UTF-8. Also including the warnings I get when starting Meld. Unfor= tunately there are no other apps using GTK on the machine and I cannot tell= if Meld is the only tool behaving this way.

    Sorry, but I'm at a bit of a los= s here. There are plenty of fun errors there, but I can't really help y= ou resolve them.
    =C2=A0
    <snip>
    /opt/csw/lib/python2.6/site-packages/gobject/__init__.py:1= 15: Warning: attempting to add an interface (GtkEditable) to class (History= FileEntry) after class_init
    =C2=A0 type_register(cls, namespace.get(= 9;__gtype_name__'))

    IIRC, this is an actual p= roblem to do with a specific version of GLib, resolved in a minor update. I= t's been a while since I saw this, but either way it's not an actua= l problem with Meld.
    =C2=A0
    Fontconfig error: "/etc/opt/csw/fontconfig/conf.d/10-scale-bitmap-fon= ts.conf", line 70: non-double matrix elementFontconfig error: "/e= tc/opt/csw/fontconfig/conf.d/10-scale-bitmap-fonts.conf", line 70: non= -double matrix element
    Fontconfig warning: "/etc/opt/csw/fontconfig/conf.d/10-scale-bitm= ap-fonts.conf", line 78: saw unknown, expected number

    This is almost certainly= the actual cause of your glyph corruption. It's been a long, long time= since I had to mess with fontconfig however, so I don't have any real = suggestions.

    cheers,
    Kai
    --f46d04426c52cc8dc705015370d2-- From mmientus@eagleseven.com Sun Aug 24 21:24:01 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id C3A1B7695E for ; Sun, 24 Aug 2014 21:24:01 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -0.012 X-Spam-Level: X-Spam-Status: No, score=-0.012 tagged_above=-999 required=2 tests=[BAYES_40=-0.001, SPF_HELO_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UqBxvaw1kKSh for ; Sun, 24 Aug 2014 21:24:01 +0000 (UTC) X-Greylist: delayed 379 seconds by postgrey-1.34 at restaurant.gnome.org; Sun, 24 Aug 2014 21:24:00 UTC Received: from mail.eagleseven.com (mail.eagleseven.com [76.74.2.20]) by restaurant.gnome.org (Postfix) with ESMTP id D1FB8762F0 for ; Sun, 24 Aug 2014 21:23:45 +0000 (UTC) Received: from HUBBARD.eagleseven.com ([::1]) by HUBBARD.eagleseven.com ([::1]) with mapi id 14.01.0218.012; Sun, 24 Aug 2014 16:17:24 -0500 From: Michael Mientus To: 'Kai Willadsen' , meld-list Subject: RE: Meld 3.11.3 Thread-Topic: Meld 3.11.3 Thread-Index: AQHPvo3g6xTw/6tbLUW/GonK+pnIMJvfGAgAgAEsYFA= Date: Sun, 24 Aug 2014 21:17:23 +0000 Message-ID: <6AE1CC62260CBE44AF6374B9D9FE3DE6685C6AB3@HUBBARD.eagleseven.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.168.70.62] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 21:24:01 -0000 Thanks ________________________ Michael Mientus -----Original Message----- From: meld-list [mailto:meld-list-bounces@gnome.org] On Behalf Of Kai Willa= dsen Sent: Saturday, August 23, 2014 5:22 PM To: meld-list Subject: Re: Meld 3.11.3 On 23 August 2014 14:50, Kai Willadsen wrote: > Meld 3.11.3 has been released, and is now available at: > http://download.gnome.org/sources/meld/3.11/meld-3.11.3.tar.xz Windows binaries are now available at: https://download.gnome.org/binaries/win32/meld/3.11/Meld-3.11.3-win32.m= si cheers, Kai _______________________________________________ meld-list mailing list meld-list@gnome.org https://mail.gnome.org/mailman/listinfo/meld-list From ezquerra@gmail.com Mon Aug 25 12:22:52 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 84EF876A07 for ; Mon, 25 Aug 2014 12:22:52 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aB8QUo-yXaOz for ; Mon, 25 Aug 2014 12:22:51 +0000 (UTC) Received: from mail-ig0-f174.google.com (mail-ig0-f174.google.com [209.85.213.174]) by restaurant.gnome.org (Postfix) with ESMTP id 2AE5A7695E for ; Mon, 25 Aug 2014 12:22:40 +0000 (UTC) Received: by mail-ig0-f174.google.com with SMTP id c1so2672456igq.7 for ; Mon, 25 Aug 2014 05:22:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=s+4aychthpicn+Rfzn05EfT6BkLe8+IZExc7s2E8kXg=; b=VFYfDebF+DnWXaUNf7Zrw8uDB2JAPsMEuJaEA27nP5NgxKCP/1QknjkUdlqT4lgVXJ bnoL12tkGqxdM1uOvpe/FN7dBzwuJ5gOzyDJfyvgTsYvW07sBeIiLG1dWMPgUKHU1oeH kbOgcdvtCtWyNkerCKcPQ+NDkC3qLStAzE9jd7f2hdDCOh6cTlZMLUmWG5kuWAKnutL7 qOsglkt3LurHbnZDhWxbwSZf86n6XlddigeMC8ZGQ1rKp1tKsyKnr9cdXmoZT70FIPys E2YZtC/YjeeZS1H6i42lEG2t/dHwpxsLwIif75+YnZ8sx8cZuNE+rqVNCy5EOQswPQEY DACA== MIME-Version: 1.0 X-Received: by 10.42.60.211 with SMTP id r19mr1357913ich.64.1408969358702; Mon, 25 Aug 2014 05:22:38 -0700 (PDT) Sender: ezquerra@gmail.com Received: by 10.107.154.74 with HTTP; Mon, 25 Aug 2014 05:22:38 -0700 (PDT) In-Reply-To: <6AE1CC62260CBE44AF6374B9D9FE3DE6685C6AB3@HUBBARD.eagleseven.com> References: <6AE1CC62260CBE44AF6374B9D9FE3DE6685C6AB3@HUBBARD.eagleseven.com> Date: Mon, 25 Aug 2014 14:22:38 +0200 X-Google-Sender-Auth: 0dJeeCTUjesqEo0C9YRs6tZPb64 Message-ID: Subject: Re: Meld 3.11.3 From: Angel Ezquerra To: Michael Mientus Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 12:22:52 -0000 Hi, I just tried these windows binaries and I had a few problems. I list them here starting from the most serious in case you are interested: 1. The most serious issue is that I can just not diff some files. I get the following error message: E:\aem\Workspaces\TERMINATOR\LTE\SW\LTE_L1_SW_SRC\LTE_L1\AcquisitionDriver\src\AcquisitionDriver.cpp.orig is not in encodings: ['utf8'] I believe I could open these files with Meld 1.8. I can open them fine with every text editor I've tried. I don't think meld should expect the files to be in a particular encoding. This problem is so serious that I cannot use this version of meld at all. 2. I cannot get syntax highlighting to work (tab completion was disabled on the preferences by default, but enabling it did not fix the problem). 3. TortoiseHg does not detect meld: The reason is that TortsoiseHg expected to find an entry on the registry that would tell it where to find the meld executable (either "SOFTWARE\Meld\Executable" or "SOFTWARE\Wow6432Node\Meld\Executable"). It is possible to manually fix this problem since you can tell TortoiseHg the exact location of meld. Also, I am a member of the TortoiseHg team, so we can change that so that TortoiseHg looks for the meld executable by location (in "${ProgramFiles(x86)}/Meld/meld.exe"), but having a registry entry (as many other diff tools on windows do) seems better, since it would let the user install Meld somewhere else. 5. Every time that I open a new meld comparison from TortoiseHg a new meld instance is open. I don't recall if older versions of meld behaved this way. In any case, is there some flag that we can pass to the meld executable so that a single meld instance is used? 6. The open externally option does not work by default. I guess it is because by default the "Use default system editor" is enabled by default. It should be possible to use a windows API to open a file with its default editor. 7. The text in the meld menus seems very "squeezed". The text in the menus seems have a proper size, but the height of the menu rows seems to bee too small. 8. In my pretty powerful PC scrolling a diff is a bit jerky. It is not as smooth as in other diff tools. In addition, and this is not related to the windows port, I find the new comparision window very confusing. The problem is that there are 3 buttons (file comparision, directory comparision, and Version Control View) and 3 file combo boxes right below them, but they are totally unrelated! That is, if you click file comparison the combo boxes are all related to file comparisons, if you click directory comparision they are related to that. The only visual clue that tells you that they are related to a mode is that the mode button that you clicked is highlighted, but IMHO this is not enough. I think there should either be some additional visual clue (e.g. a panel surrounding the combo boxes linked to the selected mode button or something of the sort) or perhaps the combo boxes should be stacked vertically instead of horizontally so that it does not seem that they are related to the comparison type buttons. Anyway, despite these problems (expcept perhaps #1 and #2) this version looks very promising. I can't for #1 to be fixed so that I can actually use it. Cheers, Angel On Sun, Aug 24, 2014 at 11:17 PM, Michael Mientus wrote: > Thanks > > ________________________ > Michael Mientus > > -----Original Message----- > From: meld-list [mailto:meld-list-bounces@gnome.org] On Behalf Of Kai Willadsen > Sent: Saturday, August 23, 2014 5:22 PM > To: meld-list > Subject: Re: Meld 3.11.3 > > On 23 August 2014 14:50, Kai Willadsen wrote: >> Meld 3.11.3 has been released, and is now available at: >> http://download.gnome.org/sources/meld/3.11/meld-3.11.3.tar.xz > > Windows binaries are now available at: > https://download.gnome.org/binaries/win32/meld/3.11/Meld-3.11.3-win32.msi > > cheers, > Kai > _______________________________________________ > meld-list mailing list > meld-list@gnome.org > https://mail.gnome.org/mailman/listinfo/meld-list > _______________________________________________ > meld-list mailing list > meld-list@gnome.org > https://mail.gnome.org/mailman/listinfo/meld-list From claudio.fischer@freenet.de Wed Aug 27 09:00:18 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id B5A0F76964 for ; Wed, 27 Aug 2014 09:00:18 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: 0.803 X-Spam-Level: X-Spam-Status: No, score=0.803 tagged_above=-999 required=2 tests=[BAYES_50=0.8, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RP_MATCHES_RCVD=0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vYrXwVd_-WGL for ; Wed, 27 Aug 2014 09:00:16 +0000 (UTC) X-Greylist: delayed 1468 seconds by postgrey-1.34 at restaurant.gnome.org; Wed, 27 Aug 2014 09:00:16 UTC Received: from mout3.freenet.de (mout3.freenet.de [195.4.92.93]) by restaurant.gnome.org (Postfix) with ESMTP id 3B9B0768D5 for ; Wed, 27 Aug 2014 09:00:05 +0000 (UTC) Received: from [195.4.92.142] (helo=mjail2.freenet.de) by mout3.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (port 25) (Exim 4.82 #2) id 1XMYhW-0006E2-GJ for meld-list@gnome.org; Wed, 27 Aug 2014 10:35:30 +0200 Received: from localhost ([::1]:51968 helo=mjail2.freenet.de) by mjail2.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (Exim 4.82 #2) id 1XMYhW-0003qK-BI for meld-list@gnome.org; Wed, 27 Aug 2014 10:35:30 +0200 Received: from mx14.freenet.de ([195.4.92.24]:33906) by mjail2.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (Exim 4.82 #2) id 1XMYfX-0001z6-MV for meld-list@gnome.org; Wed, 27 Aug 2014 10:33:27 +0200 Received: from web2.emo.freenet-rz.de ([194.97.107.235]:39135 helo=web17.emo.freenet-rz.de) by mx14.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (port 587) (Exim 4.82 #2) id 1XMYfX-0006iZ-JT for meld-list@gnome.org; Wed, 27 Aug 2014 10:33:27 +0200 Received: from localhost ([127.0.0.1] helo=emo.freenet.de) by web17.emo.freenet-rz.de with esmtpa (Exim 4.72 1 (Panther_1)) id 1XMYfX-0001wn-4h for ; Wed, 27 Aug 2014 10:33:27 +0200 Date: Wed, 27 Aug 2014 10:33:27 +0200 From: Claudio Fischer Subject: comparing files created on a Windows machine containing special characters To: meld-list@gnome.org X-Priority: 3 MIME-Version: 1.0 X-Abuse: 301154787 / 212.118.201.122 Message-Id: <0f7d21422ef4b26ef1c21ca1d88fbb90@email.freenet.de> User-Agent: freenetMail Content-Type: multipart/mixed; boundary=emoc42f97149a656e7aa07e221942e37dc5 X-Originated-At: 212.118.201.122!60939 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 09:00:18 -0000 --emoc42f97149a656e7aa07e221942e37dc5 Content-Type: multipart/alternative; boundary="emo_01_ba6ae072ddcd9481af59868a4f2808af" --emo_01_ba6ae072ddcd9481af59868a4f2808af Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi,=0A=C2=A0=0AI'm using Meld 3.11.3 and have problems comparing files crea= ted on a Windows machine.=0ATry comparing the attached file1.c and file2.c.= =0AThe files are created with the Editor Notepad on Windows XP.=0Afile1.c c= ontains the character "=C3=BC" in Hex 0xFC.=0AMeld 3.11.3 cant open file1.c= and shows "Could not read file - file1.c is not in encodings: ['utf8']"=0A= In Meld 1.8.6 there is no problem comparing these files.=0A=C2=A0=0ARegards= ,=0AClaudio=0A=0A=0A---=0AAlle Postf=C3=A4cher an einem Ort. Jetzt wechseln= und E-Mail-Adresse mitnehmen! Rundum gl=C3=BCcklich mit freenetMail --emo_01_ba6ae072ddcd9481af59868a4f2808af Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable <= META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; charset=3Dus-ascii">=

    Hi,

     

    I'm using Meld 3.11.3 and have problem= s comparing files created on a Windows machine.

    Try comparing the attached file1.c and= file2.c.

    The files are created with the Editor = Notepad on Windows XP.

    file1.c contains the character "ü= " in Hex 0xFC.

    Meld 3.11.3 cant open file1.c and show= s "Could not read file - file1.c is not in encodings: ['utf8']"

    In Meld 1.8.6 there is no problem comp= aring these files.

     

    Regards,

    Claudio



    ---
    Alle Postf=C3=A4cher an einem Or= t. Jetzt wechseln und E-Mail-Adresse mitnehmen! Rundum gl=C3=BCcklich mit freenetMail
    =0A --emo_01_ba6ae072ddcd9481af59868a4f2808af-- --emoc42f97149a656e7aa07e221942e37dc5 Content-Type: text/x-csrc; charset="utf-8"; name=file2.c Content-disposition: attachment; filename="file2.c" Content-Transfer-Encoding: quoted-printable blabla good line with character u blabla --emoc42f97149a656e7aa07e221942e37dc5 Content-Type: text/x-csrc; charset="utf-8"; name=file1.c Content-disposition: attachment; filename="file1.c" Content-Transfer-Encoding: quoted-printable blabla bad line with character =FC blabla --emoc42f97149a656e7aa07e221942e37dc5-- From kai.willadsen@gmail.com Wed Aug 27 10:02:20 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id DC6E97695D for ; Wed, 27 Aug 2014 10:02:20 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X0Ilxv8GQhUH for ; Wed, 27 Aug 2014 10:02:19 +0000 (UTC) Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by restaurant.gnome.org (Postfix) with ESMTP id 31E90768D5 for ; Wed, 27 Aug 2014 10:02:08 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id p10so15833472wes.30 for ; Wed, 27 Aug 2014 03:02:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=3b2W5P10rJzSRY/TTUc+3z363edPbiKX/I/rCNNDmhg=; b=YlHJNFGCYDweLTXDPAlWIPt5gZMpCcJ0A/cmaeXLKV0cg4SVnqpSIScvCWOh0TqIGr Ir4IZGTs6G8BnuQX/Dybxy6ehFV+QK/HAXPzgTCi7gpx9+1ZfMb5Laq0vlq9MUtH0+gX hpwt0mKjnuzstMMJjGZEiU3eD0lfNO6Y19D3aqrSO8HXd5GI6BnS9xRKzPBwe5OvigeF hJagohfpJbV+H6OmJE26yuvEOKyjCK1P5/5XYqX5WxafSuQiCeadPvT+ZHNGfMDBCmBx KCUNxi9iGE/hpdqqb+zuBDklp0px+vA5IVz2K+alMSiVO07Xc45EOsDlC3FLEMPzPFEW qqNA== MIME-Version: 1.0 X-Received: by 10.194.60.240 with SMTP id k16mr1932847wjr.109.1409133726694; Wed, 27 Aug 2014 03:02:06 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Wed, 27 Aug 2014 03:02:06 -0700 (PDT) In-Reply-To: References: <6AE1CC62260CBE44AF6374B9D9FE3DE6685C6AB3@HUBBARD.eagleseven.com> Date: Wed, 27 Aug 2014 20:02:06 +1000 Message-ID: Subject: Re: Meld 3.11.3 From: Kai Willadsen To: Angel Ezquerra Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 10:02:20 -0000 On 25 August 2014 22:22, Angel Ezquerra wrote: > Hi, > > I just tried these windows binaries and I had a few problems. I list > them here starting from the most serious in case you are interested: While I appreciate the feedback, this is way too late in the release cycle to fix most of these for 3.12. I may look at a couple, but most will have to wait for 3.14. > 1. The most serious issue is that I can just not diff some files. I > get the following error message: > > E:\aem\Workspaces\TERMINATOR\LTE\SW\LTE_L1_SW_SRC\LTE_L1\AcquisitionDriver\src\AcquisitionDriver.cpp.orig > is not in encodings: ['utf8'] > > I believe I could open these files with Meld 1.8. I can open them fine > with every text editor I've tried. I don't think meld should expect > the files to be in a particular encoding. This problem is so serious > that I cannot use this version of meld at all. The previous version of Meld tried by default to decode in UTF-8 and latin1. This was *extremely* broken behaviour, as latin1 will always succeed, regardless of actual file encoding. In 3.11.x, I've removed the latin1 default. I'm *not* going to put it back into the list in the settings, because that would mean that that monstrosity would persist (i.e., the setting may persist when someone updates). I *could* put a latin1 fallback in code and remove the fallback in 3.14 once this is fixed properly. This would then be more-or-less the same awful behaviour that we've always had so... well... great, I guess? The "Release Plans" email that I just sent mentions 'per file encoding selection' for 3.14: https://mail.gnome.org/archives/meld-list/2014-August/msg00015.html Between that and some auto-detection fallback code, this should fix the problem more sanely. > 2. I cannot get syntax highlighting to work (tab completion was > disabled on the preferences by default, but enabling it did not fix > the problem). I'm not sure why syntax highlighting isn't working, but we've definitely never supported tab completion. > 3. TortoiseHg does not detect meld: > > The reason is that TortsoiseHg expected to find an entry on the > registry that would tell it where to find the meld executable (either > "SOFTWARE\Meld\Executable" or "SOFTWARE\Wow6432Node\Meld\Executable"). > It is possible to manually fix this problem since you can tell > TortoiseHg the exact location of meld. Also, I am a member of the > TortoiseHg team, so we can change that so that TortoiseHg looks for > the meld executable by location (in > "${ProgramFiles(x86)}/Meld/meld.exe"), but having a registry entry (as > many other diff tools on windows do) seems better, since it would let > the user install Meld somewhere else. Yeah I don't really know anything about the MSI we're generating here... obviously it would be nice to be generating something more sensible. Keegan had several similar suggestions that I've failed to followed up on due to complete lack of time. Could you file a bug for this please? > 5. Every time that I open a new meld comparison from TortoiseHg a new > meld instance is open. I don't recall if older versions of meld > behaved this way. In any case, is there some flag that we can pass to > the meld executable so that a single meld instance is used? I don't know whether this works on Windows, but on Linux the opposite of this is now true. We used to by default run a separate instance each time we were run, and now we're a single instance app that happens to open multiple windows, though with a few exceptions you shouldn't notice this. If you're just talking about the number of windows we create, then yes, we've always created new windows by default. The --newtab option should still work however. > 6. The open externally option does not work by default. I guess it is > because by default the "Use default system editor" is enabled by > default. It should be possible to use a windows API to open a file > with its default editor. Could you be more specific about 'does not work'? It has (fairly) recently worked for me. On Windows, this is equivalent to running 'start '. According to a comment I don't remember writing, file type detection with gio on Windows is broken, so if you're expecting to see some more specialised behaviour then that could be the issue. > 7. The text in the meld menus seems very "squeezed". The text in the > menus seems have a proper size, but the height of the menu rows seems > to bee too small. This is the GTK theme. I believe this should be fixed by updating the GTK we bundle. > 8. In my pretty powerful PC scrolling a diff is a bit jerky. It is not > as smooth as in other diff tools. This probably isn't something I can do much about. It's certainly possible that it's us, but just as likely that it's GTK on Windows. Are you saying that this is noticeably less smooth than 1.8.x? > In addition, and this is not related to the windows port, I find the > new comparision window very confusing. The problem is that there are 3 > buttons (file comparision, directory comparision, and Version Control > View) and 3 file combo boxes right below them, but they are totally > unrelated! That is, if you click file comparison the combo boxes are > all related to file comparisons, if you click directory comparision > they are related to that. The only visual clue that tells you that > they are related to a mode is that the mode button that you clicked is > highlighted, but IMHO this is not enough. I think there should either > be some additional visual clue (e.g. a panel surrounding the combo > boxes linked to the selected mode button or something of the sort) or > perhaps the combo boxes should be stacked vertically instead of > horizontally so that it does not seem that they are related to the > comparison type buttons. Others have had similar comments. If someone want to look at improving the layout and/or themeing then that would be great. However, I haven't actually seen any suggestions that I like yet. > Anyway, despite these problems (expcept perhaps #1 and #2) this > version looks very promising. I can't for #1 to be fixed so that I can > actually use it. You should be able to 'fix' this manually by setting the (unsupported!) gsettings key at /org/gnome/meld/detect-encodings to ["utf8", "latin1"] or similar. I don't actually know how to do this on Windows however. I believe that gsettings on Windows backs on to the registry, but can't tell you anything else about it. cheers, Kai From kai.willadsen@gmail.com Wed Aug 27 10:04:22 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 3025A7697D for ; Wed, 27 Aug 2014 10:04:22 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id shKKTLPhUmti for ; Wed, 27 Aug 2014 10:04:21 +0000 (UTC) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by restaurant.gnome.org (Postfix) with ESMTP id 2ACF47695D for ; Wed, 27 Aug 2014 10:04:10 +0000 (UTC) Received: by mail-wi0-f173.google.com with SMTP id f8so5554446wiw.6 for ; Wed, 27 Aug 2014 03:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=n6RflW58PjkmUE5LaAu94KIBTa0Qm32C5IZNMIYjPjg=; b=LXJp64R5LnQZlGh9lgoFyxghLfdyP4vys6q/oSYoqOgwc/lWYvx+nVLL3Su5F1HkK4 J/3xlymeUqMNXXyHS8sxAoghfDb/127X3ztTaw77Z/1ib5O2zXh/q0LBzadkTRy8S2Ti V3jiH1+HV7bPZy6H/UrqX8oK+jc+qoYTqOxhf1hnhHmSjy4BhCT1xf5NTmBuCfquPYfe NKhLHx2yGCNfhSiWc1XZf2d2aoDuBiVhHCEl1rcexpBiFnBCT2nPq6bKmrwR0pYk0Hbs R5rBc3Hrjvb9KLGqFASx58qkM87VjZHsYn+fG1qFvJh2X5EEclCz+6LHxk3t+U+D1zH/ juVQ== MIME-Version: 1.0 X-Received: by 10.180.11.177 with SMTP id r17mr26675143wib.67.1409133848565; Wed, 27 Aug 2014 03:04:08 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Wed, 27 Aug 2014 03:04:08 -0700 (PDT) In-Reply-To: <0f7d21422ef4b26ef1c21ca1d88fbb90@email.freenet.de> References: <0f7d21422ef4b26ef1c21ca1d88fbb90@email.freenet.de> Date: Wed, 27 Aug 2014 20:04:08 +1000 Message-ID: Subject: Re: comparing files created on a Windows machine containing special characters From: Kai Willadsen To: Claudio Fischer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 10:04:22 -0000 On 27 August 2014 18:33, Claudio Fischer wrote= : > Hi, > > I'm using Meld 3.11.3 and have problems comparing files created on a Wind= ows > machine. > > Try comparing the attached file1.c and file2.c. > > The files are created with the Editor Notepad on Windows XP. > > file1.c contains the character "=C3=BC" in Hex 0xFC. > > Meld 3.11.3 cant open file1.c and shows "Could not read file - file1.c is > not in encodings: ['utf8']" > > In Meld 1.8.6 there is no problem comparing these files. This is the same problem Angel mentioned in the "Meld 3.11.3" thread. I've responded there. I'm sorry that I can't give you an immediate workaround. If no one else figures out gsettings on Windows soon, I'll see whether I can find the necessary incantations. cheers, Kai From claudio.fischer@freenet.de Wed Aug 27 10:58:57 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 2192376982 for ; Wed, 27 Aug 2014 10:58:57 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.898 X-Spam-Level: X-Spam-Status: No, score=-1.898 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RP_MATCHES_RCVD=0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dTBn4NFGaX8k for ; Wed, 27 Aug 2014 10:58:54 +0000 (UTC) Received: from mout0.freenet.de (mout0.freenet.de [195.4.92.90]) by restaurant.gnome.org (Postfix) with ESMTP id 79DA07697D for ; Wed, 27 Aug 2014 10:58:43 +0000 (UTC) Received: from [195.4.92.142] (helo=mjail2.freenet.de) by mout0.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (port 25) (Exim 4.82 #2) id 1XMaw4-0002ox-On; Wed, 27 Aug 2014 12:58:40 +0200 Received: from localhost ([::1]:38741 helo=mjail2.freenet.de) by mjail2.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (Exim 4.82 #2) id 1XMaw4-0003NL-E6; Wed, 27 Aug 2014 12:58:40 +0200 Received: from mx17.freenet.de ([195.4.92.27]:51541) by mjail2.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (Exim 4.82 #2) id 1XMask-0000Il-8t; Wed, 27 Aug 2014 12:55:14 +0200 Received: from web3.emo.freenet-rz.de ([194.97.107.236]:62902 helo=web9.emo.freenet-rz.de) by mx17.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (port 587) (Exim 4.82 #2) id 1XMask-00023B-6v; Wed, 27 Aug 2014 12:55:14 +0200 Received: from localhost ([127.0.0.1] helo=emo.freenet.de) by web9.emo.freenet-rz.de with esmtpa (Exim 4.72 1 (Panther_1)) id 1XMasj-0004YK-LN; Wed, 27 Aug 2014 12:55:13 +0200 Date: Wed, 27 Aug 2014 12:55:13 +0200 From: Claudio Fischer Subject: RE: Re: comparing files created on a Windows machine containing special characters To: Kai Willadsen X-Priority: 3 MIME-Version: 1.0 X-Abuse: 301154787 / 212.118.201.122 Message-Id: <2612b6722ecdc6f1807c5f751f7aa1ef@email.freenet.de> User-Agent: freenetMail Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originated-At: 212.118.201.122!44842 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 10:58:57 -0000 thanks, sorry to mention that I'm working on Ubuntu 14.04 64 Bit,=20 not on Windows, only the files were created on Windows. I'm running meld without install directly ~/meld-3.11.3/bin/meld. Is there a workaround I can use? Regards, Claudio > -----Urspr=C3=BCngliche Nachricht----- > Von: Kai Willadsen=20 > Gesendet: Mi. 27.08.2014 21:04 > An: Claudio Fischer ,=20 > Kopie: meld-list ,=20 > Betreff: Re: comparing files created on a Windows machine containing spec= ial characters > > On 27 August 2014 18:33, Claudio Fischer > wrote: >> Hi, >> >> I'm using Meld 3.11.3 and have > problems comparing files created on a Windows >> machine. >> >> Try comparing the attached file1.c and > file2.c. >> >> The files are created with the Editor > Notepad on Windows XP. >> >> file1.c contains the character > "=C3=BC" in Hex 0xFC. >> >> Meld 3.11.3 cant open file1.c and > shows "Could not read file - file1.c is >> not in encodings: ['utf8']" >> >> In Meld 1.8.6 there is no problem > comparing these files. > > This is the same problem Angel mentioned in the "Meld 3.11.3" thread. > I've responded there. I'm sorry that I can't give you an immediate > workaround. If no one else figures out gsettings on Windows soon, > I'll > see whether I can find the necessary incantations. > > cheers, > Kai > > > -----Urspr=C3=BCngliche Nachricht Ende----- =0A=0A---=0AAlle Postf=C3=A4cher an einem Ort. Jetzt wechseln und E-Mail-Ad= resse mitnehmen! http://email.freenet.de/basic/Informationen=0A=0A From kai.willadsen@gmail.com Wed Aug 27 21:27:20 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 648AA7697D for ; Wed, 27 Aug 2014 21:27:20 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0RxNFl6X8E1X for ; Wed, 27 Aug 2014 21:27:19 +0000 (UTC) Received: from mail-we0-f173.google.com (mail-we0-f173.google.com [74.125.82.173]) by restaurant.gnome.org (Postfix) with ESMTP id C1280768D5 for ; Wed, 27 Aug 2014 21:27:08 +0000 (UTC) Received: by mail-we0-f173.google.com with SMTP id t60so72247wes.18 for ; Wed, 27 Aug 2014 14:27:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=YYQYFSewRBHeKUJx7iSpq0mXQbcLRV74QioRA4e3xsU=; b=0KGP33GlaXD6b9gpdLNDxfZSJnwelAdl2hwhaB9RT8easO5c7SIZSTX6N/a7qeX1wq /1iKz+fWgkmqgPyiycdrhbIyfHuecF10PNDPZYZgm/RXM5oEFwgzESylGLanvJe81tgX vTxu6YvQhqUIjOjqGEOTZdH14vK1xBCbLj+oGfsxec3DvOHO0/qanP6vWs65IG3nG16l JuzHtMzqafJvx8K9+WrhTbjFLJX2HMxSYjHZhu7TWVd46DL/BOSJewenZbHS+Y8s4E4G 5vGpzTpRTc9JtBrIUQA1ZIZZjYbJ8YSxKiGLAewlP3T4SgS/9HQL7ROvgTC/mw4O1cfQ bosw== MIME-Version: 1.0 X-Received: by 10.180.211.172 with SMTP id nd12mr736289wic.74.1409174826258; Wed, 27 Aug 2014 14:27:06 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Wed, 27 Aug 2014 14:27:06 -0700 (PDT) In-Reply-To: <2612b6722ecdc6f1807c5f751f7aa1ef@email.freenet.de> References: <2612b6722ecdc6f1807c5f751f7aa1ef@email.freenet.de> Date: Thu, 28 Aug 2014 07:27:06 +1000 Message-ID: Subject: Re: Re: comparing files created on a Windows machine containing special characters From: Kai Willadsen To: Claudio Fischer Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 21:27:20 -0000 On 27 August 2014 20:55, Claudio Fischer wrote: > thanks, > sorry to mention that I'm working on Ubuntu 14.04 64 Bit, > not on Windows, only the files were created on Windows. > I'm running meld without install directly ~/meld-3.11.3/bin/meld. > Is there a workaround I can use? Try: gsettings set org.gnome.meld detect-encodings "['utf8', 'latin1']" which should set Meld to fall back to latin1 by default. I *strongly* encourage you to remove this setting once this has been fixed in Meld proper. cheers, Kai From claudio.fischer@freenet.de Thu Aug 28 07:48:00 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 4D23D769D0 for ; Thu, 28 Aug 2014 07:48:00 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.898 X-Spam-Level: X-Spam-Status: No, score=-1.898 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RP_MATCHES_RCVD=0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WkdRlc1GtmmS for ; Thu, 28 Aug 2014 07:47:58 +0000 (UTC) Received: from mout0.freenet.de (mout0.freenet.de [195.4.92.90]) by restaurant.gnome.org (Postfix) with ESMTP id 8311D76982 for ; Thu, 28 Aug 2014 07:47:42 +0000 (UTC) Received: from [195.4.92.142] (helo=mjail2.freenet.de) by mout0.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (port 25) (Exim 4.82 #2) id 1XMuQm-0004KP-Mw for meld-list@gnome.org; Thu, 28 Aug 2014 09:47:40 +0200 Received: from localhost ([::1]:59592 helo=mjail2.freenet.de) by mjail2.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (Exim 4.82 #2) id 1XMuQm-0008Hg-Hy for meld-list@gnome.org; Thu, 28 Aug 2014 09:47:40 +0200 Received: from mx3.freenet.de ([195.4.92.13]:56674) by mjail2.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (Exim 4.82 #2) id 1XMuNv-00064n-Lp; Thu, 28 Aug 2014 09:44:43 +0200 Received: from web1.emo.freenet-rz.de ([194.97.107.234]:56966 helo=web17.emo.freenet-rz.de) by mx3.freenet.de with esmtpa (ID claudio.fischer@freenet.de) (port 587) (Exim 4.82 #2) id 1XMuNv-00027i-Js; Thu, 28 Aug 2014 09:44:43 +0200 Received: from localhost ([127.0.0.1] helo=emo.freenet.de) by web17.emo.freenet-rz.de with esmtpa (Exim 4.72 1 (Panther_1)) id 1XMuNv-0006lT-57; Thu, 28 Aug 2014 09:44:43 +0200 Date: Thu, 28 Aug 2014 09:44:43 +0200 From: Claudio Fischer Subject: RE: Re: Re: comparing files created on a Windows machine containing special characters To: Kai Willadsen X-Priority: 3 MIME-Version: 1.0 X-Abuse: 301154787 / 212.118.201.122 Message-Id: <780f11210723784b97476c31fa6ef8dc@email.freenet.de> User-Agent: freenetMail Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originated-At: 212.118.201.122!47550 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Aug 2014 07:48:00 -0000 Hi Kai, thanks for the tip, this works. Now I can use Meld 3.11.3 :-) Regards, Claudio > -----Urspr=C3=BCngliche Nachricht----- > Von: Kai Willadsen=20 > Gesendet: Do. 28.08.2014 08:27 > An: Claudio Fischer ,=20 > Kopie: meld-list ,=20 > Betreff: Re: Re: comparing files created on a Windows machine containing = special characters > > On 27 August 2014 20:55, Claudio Fischer > wrote: >> thanks, >> sorry to mention that I'm =20 > working on Ubuntu 14.04 64 Bit, >> not on Windows, only the files were > created on Windows. >> I'm running meld without install > directly ~/meld-3.11.3/bin/meld. >> Is there a workaround I can > use? > > Try: > gsettings set org.gnome.meld detect-encodings "['utf8', > 'latin1']" > > which should set Meld to fall back to latin1 by default. I *strongly* > encourage you to remove this setting once this has been fixed in Meld > proper. > > cheers, > Kai > > > -----Urspr=C3=BCngliche Nachricht Ende----- =0A=0A---=0AAlle Postf=C3=A4cher an einem Ort. Jetzt wechseln und E-Mail-Ad= resse mitnehmen! http://email.freenet.de/basic/Informationen=0A=0A From kai.willadsen@gmail.com Thu Aug 28 21:26:56 2014 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 835D1769E3 for ; Thu, 28 Aug 2014 21:26:56 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.7 X-Spam-Level: X-Spam-Status: No, score=-2.7 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LOCx0q0-QTX1 for ; Thu, 28 Aug 2014 21:26:55 +0000 (UTC) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by restaurant.gnome.org (Postfix) with ESMTP id 587AC769DF for ; Thu, 28 Aug 2014 21:26:44 +0000 (UTC) Received: by mail-wi0-f170.google.com with SMTP id cc10so10350wib.5 for ; Thu, 28 Aug 2014 14:26:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=jexbtAaNHwjMMXcZ9RW7g4xz3sPO9u1mximgVWVHGZ4=; b=T8kT7MNk1QgrG4uh5S/GcoVcSZpVMPmccMbJ3MEtDxsp8Rcayh914aVciSE4XD9fLl Sj082kOFRMQWc2mri20oQYvYXnc9m/LpjbFyT5L5Z+S6PmFrFbtXNLSr14MCix1rlzZH ng1TBRBKS0ottNbke+Rk1aT/hEdL6M41tGdgIAR/yI1/465OggghvcIaIFCcgUQj5PZG 40CMiKVVcRLAj8lDJfvOtQsZpIG8mJ1iRwcWF5APm0aAO0LYZRRzC5FAsgtuf8KxcDlA bC2E+gu3FfqqR0cUQRheGaM58EzXxv2qebUlYyCoSwmi/6jpJVIYttAw4bLmdtYCkTAb pbBQ== MIME-Version: 1.0 X-Received: by 10.180.85.136 with SMTP id h8mr41126759wiz.67.1409261202835; Thu, 28 Aug 2014 14:26:42 -0700 (PDT) Received: by 10.217.133.208 with HTTP; Thu, 28 Aug 2014 14:26:42 -0700 (PDT) In-Reply-To: References: <6AE1CC62260CBE44AF6374B9D9FE3DE6685C6AB3@HUBBARD.eagleseven.com> Date: Fri, 29 Aug 2014 07:26:42 +1000 Message-ID: Subject: Re: Meld 3.11.3 From: Kai Willadsen To: Angel Ezquerra Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Aug 2014 21:26:56 -0000 On 27 August 2014 20:02, Kai Willadsen wrote: > On 25 August 2014 22:22, Angel Ezquerra wrote: >> I believe I could open these files with Meld 1.8. I can open them fine >> with every text editor I've tried. I don't think meld should expect >> the files to be in a particular encoding. This problem is so serious >> that I cannot use this version of meld at all. See below for the workaround. >> 2. I cannot get syntax highlighting to work (tab completion was >> disabled on the preferences by default, but enabling it did not fix >> the problem). > > I'm not sure why syntax highlighting isn't working, but we've > definitely never supported tab completion. I'm pretty sure that syntax highlighting is not working for the same reason as Open Externally. I suspect that we're not getting the MIME type back from gio, and therefore can't set the highlight language. >> The reason is that TortsoiseHg expected to find an entry on the >> registry that would tell it where to find the meld executable (either >> "SOFTWARE\Meld\Executable" or "SOFTWARE\Wow6432Node\Meld\Executable"). >> It is possible to manually fix this problem since you can tell >> TortoiseHg the exact location of meld. Also, I am a member of the >> TortoiseHg team, so we can change that so that TortoiseHg looks for >> the meld executable by location (in >> "${ProgramFiles(x86)}/Meld/meld.exe"), but having a registry entry (as >> many other diff tools on windows do) seems better, since it would let >> the user install Meld somewhere else. So that registry path seems to be something that Keegan provided in the old bundle. I'm okay with trying to reproduce that, but is there a standard place to put this information on Windows? > On Windows, this is equivalent to running 'start '. According to > a comment I don't remember writing, file type detection with gio on > Windows is broken, so if you're expecting to see some more specialised > behaviour then that could be the issue. Yeah I think this is the problem. Open Externally works fine on Windows for directories (because we don't try to find the file type) but apparently something weird happens for other files, even though we try to fall back. I'll investigate in case it's an easy fix. > You should be able to 'fix' this manually by setting the > (unsupported!) gsettings key at /org/gnome/meld/detect-encodings to > ["utf8", "latin1"] or similar. I don't actually know how to do this on > Windows however. I believe that gsettings on Windows backs on to the > registry, but can't tell you anything else about it. At the key HKEY_CURRENT_USER\Software\GSettings\org\gnome\meld, try adding a SZ value of detect-encodings with data ['utf-8', 'latin1']. I haven't tested this but I imagine it should work. cheers, Kai