From gus@sgi.com Mon Aug 10 13:36:07 2015 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 3862A7684C for ; Mon, 10 Aug 2015 13:36:07 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.079 X-Spam-Level: X-Spam-Status: No, score=-1.079 tagged_above=-999 required=2 tests=[BAYES_50=0.8, HTML_MESSAGE=0.001, MIME_HTML_MOSTLY=0.428, RCVD_IN_DNSWL_MED=-2.3, RP_MATCHES_RCVD=-0.009, TVD_SPACE_RATIO=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 3iZNuOpnAud4 for ; Mon, 10 Aug 2015 13:36:06 +0000 (UTC) X-Greylist: delayed 397 seconds by postgrey-1.34 at restaurant.gnome.org; Mon, 10 Aug 2015 13:36:06 UTC Received: from relay.sgi.com (relay3.sgi.com [192.48.152.1]) by restaurant.gnome.org (Postfix) with ESMTP id 61A037648F for ; Mon, 10 Aug 2015 13:36:05 +0000 (UTC) Received: from xmail.sgi.com (pv-excas1-dc21.corp.sgi.com [137.38.106.7]) by relay3.corp.sgi.com (Postfix) with ESMTP id 646F7AC002 for ; Mon, 10 Aug 2015 06:29:27 -0700 (PDT) Received: from P-EXMB6-DC21.corp.sgi.com ([169.254.5.18]) by PV-EXCAS1-DC21.corp.sgi.com ([137.38.106.7]) with mapi id 14.03.0195.001; Mon, 10 Aug 2015 08:29:26 -0500 From: Gus Gessert To: "meld-list@gnome.org" Subject: unsubscribe Thread-Topic: unsubscribe Thread-Index: AdDTcJH1ObLX8En3RWKos3qwQj+gtg== Date: Mon, 10 Aug 2015 13:29:25 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [134.15.87.106] Content-Type: multipart/alternative; boundary="_000_DB9C231CBB81374B8896913E5593D7C7016036E5DEPEXMB6DC21cor_" 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: Mon, 10 Aug 2015 13:36:07 -0000 --_000_DB9C231CBB81374B8896913E5593D7C7016036E5DEPEXMB6DC21cor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable unsubscribe --_000_DB9C231CBB81374B8896913E5593D7C7016036E5DEPEXMB6DC21cor_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

unsubscribe

--_000_DB9C231CBB81374B8896913E5593D7C7016036E5DEPEXMB6DC21cor_-- From beyer.andrew@gmail.com Tue Aug 11 01:47:25 2015 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 2E1327684C for ; Tue, 11 Aug 2015 01:47:25 +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 7JIAqJLC5wkM for ; Tue, 11 Aug 2015 01:47:24 +0000 (UTC) Received: from mail-oi0-f45.google.com (mail-oi0-f45.google.com [209.85.218.45]) by restaurant.gnome.org (Postfix) with ESMTP id 5B2F8762A7 for ; Tue, 11 Aug 2015 01:47:24 +0000 (UTC) Received: by oip136 with SMTP id 136so95822529oip.1 for ; Mon, 10 Aug 2015 18:47:22 -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=9xvj9Z9aK0C+K4PRH3lT+QNGVuFfZMWwDEEGuSjj19Y=; b=FXBsaS1DmmlbcBqj0AjOgV4gQBovkTLaWtRxk3og0LgGe3fJ2Pri1Fop6TAVG/re0s XBnsDfrQP/Igja8+1V9Up2wuEnGyqbY57TVzNTDsvnpjU3/vtQE+DZLxuXhgNEkHNl73 nf75AWwTiih0FHN0aKZNGr5m7SlZSb7/kg8Hb1GFMlW/YmrPm58uhy0CT7BJIbP+UQhO v7xM42RrPtUz1/thdTONuGuqt6v9DTNJ4m1JopcE4+XIX2qUvCSeJFD78/VJHytP9CPU dwlRkc5aYcrs6dvoNgq0C5Ms1XpSEnVw05AFcWrRB5ZwpcTW77xO70fn3R+aiwc6Em5o lOSw== MIME-Version: 1.0 X-Received: by 10.202.94.212 with SMTP id s203mr21589253oib.19.1439257642501; Mon, 10 Aug 2015 18:47:22 -0700 (PDT) Received: by 10.202.86.10 with HTTP; Mon, 10 Aug 2015 18:47:22 -0700 (PDT) Date: Mon, 10 Aug 2015 18:47:22 -0700 Message-ID: Subject: markdown fix in readme From: Andrew Beyer 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: Tue, 11 Aug 2015 01:47:25 -0000 FYI, there's some unescaped markdown in the README that throws off formatter: diff --git a/README b/README index e603f11..7f541c3 100644 --- a/README +++ b/README @@ -39,7 +39,7 @@ or if you're on Ubuntu, instead try: * `python setup.py install --prefix=/usr` ...but you should probably just get a RPM/deb/installer instead, depending on -your system. Meld packages are available for just about every *nix +your system. Meld packages are available for just about every \*nix distribution. For Windows users, MSIs are available from the Meld home page. From beyer.andrew@gmail.com Tue Aug 11 03:32:44 2015 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 753EB7684C for ; Tue, 11 Aug 2015 03:32:44 +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 1RZB2WI7iv4z for ; Tue, 11 Aug 2015 03:32:42 +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 2A8FE762A7 for ; Tue, 11 Aug 2015 03:32:42 +0000 (UTC) Received: by oio137 with SMTP id 137so96166701oio.0 for ; Mon, 10 Aug 2015 20:32:40 -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=3Ls427J4+C1AR96Y5dFoc+E/XOvSus6zUM72+VBkEvM=; b=sl+0zn+4qK4eXu+bazwB9mmWZDioR2nVHFBTPnIm7UcLhhWVP7aDPnEd9zBporVmbF 7zKNpf5INweHosJU9nO2FUACta9f6VWimU2VOCpm5xr0UcKoyzO4pNcBVXtNATHxgr7O RPtD4AD6p6P3/g6vYlbJTVRQyd6Y7Pr/6Hly8uT2V+kkXyPKWhq++B/vU8So4Cjs92Ed FeSHoil/nUIR81d0i1Omk1OjRb4ACW1wK/K4ZXpWx7o7DZ5ppwm6deEBw2AJ/AQ8d7mJ QY6KT0gIP7sYDMRXMM5y/7XVeXhFNAKa7i4bucl1iIqnkzTlBO6ZrzKBAsG0MGcJcCeO d80A== MIME-Version: 1.0 X-Received: by 10.202.1.210 with SMTP id 201mr9335562oib.3.1439263960528; Mon, 10 Aug 2015 20:32:40 -0700 (PDT) Received: by 10.202.86.10 with HTTP; Mon, 10 Aug 2015 20:32:40 -0700 (PDT) In-Reply-To: References: Date: Mon, 10 Aug 2015 20:32:40 -0700 Message-ID: Subject: Re: markdown fix in readme From: Andrew Beyer 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: Tue, 11 Aug 2015 03:32:44 -0000 also, dependency versions are out of sync w/ the code: diff --git a/README b/README index e603f11..0004b48 100644 --- a/README +++ b/README @@ -17,10 +17,10 @@ Requirements ------------ * Python 2.7 -* GTK+ 3.12 +* GTK+ 3.14 * GLib 2.36 * PyGObject 3.8 -* GtkSourceView 3.10 +* GtkSourceView 3.14 Running On Mon, Aug 10, 2015 at 6:47 PM, Andrew Beyer wrote: > FYI, there's some unescaped markdown in the README that throws off formatter: > > diff --git a/README b/README > index e603f11..7f541c3 100644 > --- a/README > +++ b/README > @@ -39,7 +39,7 @@ or if you're on Ubuntu, instead try: > * `python setup.py install --prefix=/usr` > > ...but you should probably just get a RPM/deb/installer instead, depending on > -your system. Meld packages are available for just about every *nix > +your system. Meld packages are available for just about every \*nix > distribution. > > For Windows users, MSIs are available from the Meld home page. From kai.willadsen@gmail.com Tue Aug 11 20:44:48 2015 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 F1461769B6 for ; Tue, 11 Aug 2015 20:44:48 +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 9EWgQdYbaXYX for ; Tue, 11 Aug 2015 20:44:47 +0000 (UTC) Received: from mail-yk0-f171.google.com (mail-yk0-f171.google.com [209.85.160.171]) by restaurant.gnome.org (Postfix) with ESMTP id B4838768AF for ; Tue, 11 Aug 2015 20:44:47 +0000 (UTC) Received: by ykdt205 with SMTP id t205so97290431ykd.1 for ; Tue, 11 Aug 2015 13:44:45 -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=Y/LU8awUujGjb3lK+N84ktE2uEZO6FuJFamHTNQyJ3E=; b=oB2Lxg0KW5nAx+yynq4iHFjH4iMI9lBo4CRRbf3R9s+chCaLEETSIJvEx0U3nj+7U3 y6SHYCx7ZDZOy2YsTLqc5hD1W9WdcKPl4UOPUSpFE8RgceO+zFifkzyGbFOsmEz9Uct6 uIh2aY4SCQnisnGZvzLQsynM6gkba7qaU6DcfJYM2B8zhoIVFmsH9Hj6XNM+AhBQ7buB HZh5PCUfnb7iqhgkIwq3tI3NvhqpiD7yMaBt95RNvLPZgq3fymnl1jGbFUZm7Lo3o9+F Ws0+UVkA8dzcxM+WPj8tg4Tc8CE24haiMoBMK/9fSHaqmJKqhuU/KixjswChwwi1DgM2 oa6A== MIME-Version: 1.0 X-Received: by 10.170.62.194 with SMTP id e185mr408957yke.90.1439325885872; Tue, 11 Aug 2015 13:44:45 -0700 (PDT) Received: by 10.13.211.67 with HTTP; Tue, 11 Aug 2015 13:44:45 -0700 (PDT) In-Reply-To: References: Date: Wed, 12 Aug 2015 06:44:45 +1000 Message-ID: Subject: Re: markdown fix in readme From: Kai Willadsen To: Andrew Beyer 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: Tue, 11 Aug 2015 20:44:49 -0000 Thanks. I've pushed both of those changes to master. On 11 August 2015 at 13:32, Andrew Beyer wrote: > also, dependency versions are out of sync w/ the code: > > diff --git a/README b/README > index e603f11..0004b48 100644 > --- a/README > +++ b/README > @@ -17,10 +17,10 @@ Requirements > ------------ > > * Python 2.7 > -* GTK+ 3.12 > +* GTK+ 3.14 > * GLib 2.36 > * PyGObject 3.8 > -* GtkSourceView 3.10 > +* GtkSourceView 3.14 > > > Running > > On Mon, Aug 10, 2015 at 6:47 PM, Andrew Beyer wrote: >> FYI, there's some unescaped markdown in the README that throws off formatter: >> >> diff --git a/README b/README >> index e603f11..7f541c3 100644 >> --- a/README >> +++ b/README >> @@ -39,7 +39,7 @@ or if you're on Ubuntu, instead try: >> * `python setup.py install --prefix=/usr` >> >> ...but you should probably just get a RPM/deb/installer instead, depending on >> -your system. Meld packages are available for just about every *nix >> +your system. Meld packages are available for just about every \*nix >> distribution. >> >> For Windows users, MSIs are available from the Meld home page. > _______________________________________________ > meld-list mailing list > meld-list@gnome.org > https://mail.gnome.org/mailman/listinfo/meld-list From kai.willadsen@gmail.com Tue Aug 11 21:45:17 2015 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 54060769B6 for ; Tue, 11 Aug 2015 21:45:17 +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 XlTMR7lVVHlR for ; Tue, 11 Aug 2015 21:45:16 +0000 (UTC) Received: from mail-yk0-f173.google.com (mail-yk0-f173.google.com [209.85.160.173]) by restaurant.gnome.org (Postfix) with ESMTP id 5E44E76981 for ; Tue, 11 Aug 2015 21:45:16 +0000 (UTC) Received: by ykay144 with SMTP id y144so4830940yka.3 for ; Tue, 11 Aug 2015 14:45:14 -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=0c7KEEPvKyR9fOFXuqmIPjzh2yxI5HyyDHdR3FVXVOk=; b=sJw9J/YkkQKZOeB7diwyMnGEpYBWh8Kcdokrs413iFCOU1Sw+FJbvMt9yHBglfPYCE gff/ZShMNxZoSzuvrlr0FSBfnoJzjk3AKLxFSRMdmyR4ig/HHQ+IKXAQElAqUxUask+Z SSBg0S84ledPOt2CXqo4rDJO4MbXl/c+m2J7d5OCsktGLAcNmTEMLXriJ2J7PTatSEAZ u/tBBEvtG9tRMVc2RyjiigMkBCG3Kw5A4L2GBOKuuTh7/DUVRCrvtPUWPgJf/nTXQ+RA Qjr9wqVIV84G4v5Xhj/IdAsqQ1jLqrpEQUD7t8wg0qknDHN3p187Y9ijdnDAxitAQxKw IH9g== MIME-Version: 1.0 X-Received: by 10.13.192.132 with SMTP id b126mr30470808ywd.163.1439329514363; Tue, 11 Aug 2015 14:45:14 -0700 (PDT) Received: by 10.13.211.67 with HTTP; Tue, 11 Aug 2015 14:45:14 -0700 (PDT) In-Reply-To: <2D9F1FE45BD65C46A38FF932D6F06ED7B9302948@EVS1CCR.its.caregroup.org> References: <2D9F1FE45BD65C46A38FF932D6F06ED7B930292C@EVS1CCR.its.caregroup.org> <2D9F1FE45BD65C46A38FF932D6F06ED7B9302948@EVS1CCR.its.caregroup.org> Date: Wed, 12 Aug 2015 07:45:14 +1000 Message-ID: Subject: Re: SVN Keyword filter From: Kai Willadsen To: wkiger@bidmc.harvard.edu 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: Tue, 11 Aug 2015 21:45:17 -0000 On 28 July 2015 at 00:39, wrote: > On 7/24/2015 8:53 PM, Kai Willadsen wrote: >> >> >I think this can be fixed by >> > changing the line in data/org.gnome.meld.gschema.xml from >> > >> > ("CVS/SVN keywords", false, "\$\\w+(:[^\\n$]+)?\$"), >> > >> > to >> > >> > ("CVS/SVN keywords", false, "\\$\\w+(:[^\\n\\$]+)?\\$"), >> > >> > i.e., by doubling the back slashes before each $. >> >> Interesting... I'm sure this has worked in the past, so I guess the >> gsettings schema migration must have changed the required escaping. >> Thanks for finding this; I'll probably just apply that change after >> some testing. >> > > I would like to make a suggestion for your testing of the proposed change. > > When I tested this change, I found that the back slashes immediately > preceding the first and third dollar signs need to be doubled for the > filter to work for single line SVN keywords. I guess (I have trouble > reading regex) that the middle dollar sign following the \n is for > multiline SVN keywords. Doubling the backslashes preceding the second > dollar sign didn't make any difference to success or failure for my > single line SVN keywords. I unfortunately don't have any examples of > multiline SVN keywords and am unsure of the details of their format. So > I suggest examining this point which was outside the scope of what I was > able to test. I think you're right that the middle $ is intended to be for multiline keywords, but since we don't support filtering multiple lines (one day...) it's not going to do anything anyway. I've actually elected to leave it as-is, while applying your changes to double the escaping for the starting and ending $s. Anyway, I've pushed that change to master and the 3.14 branch. Thanks for the fix! cheers, Kai From eychenz@gmail.com Fri Aug 21 14:36:52 2015 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 895A47676C for ; Fri, 21 Aug 2015 14:36: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 EZaJnwXkQcpo for ; Fri, 21 Aug 2015 14:36:51 +0000 (UTC) Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com [209.85.220.45]) by restaurant.gnome.org (Postfix) with ESMTP id 58425762A7 for ; Fri, 21 Aug 2015 14:36:50 +0000 (UTC) Received: by pacdd16 with SMTP id dd16so45702522pac.2 for ; Fri, 21 Aug 2015 07:36:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:date:content-type:mime-version; bh=FRYcen/g5xXBSTg90bOLIoqyIfzBn4fDn7BXL8rXtac=; b=lUQ/8PcDrcRx8l0FHlmlhjdMzLqYfAvcgD3a/MvcnabaB/8tr1BiiRStT/og05JVhk qwxNKQCkz6BwkW2/nRU7oxNUWhSFzL28Lm5aixg8OUf3lD1Ji6Oe2b0tlJaeyJovttGg HsH850hpjxCQo9T5ymCQLOW7rgkKOvRYwcmpcAUwfBY3bKYIocVVKexPDHdyOq4DUJhr Eoe28dAc6OFuLJahe8vZXl+vUlJOtttycaVlAhOR3bVgrIjZzJaETgJy//o1y1d9/nbc 9ZrwBcVVNLhW1dX78KB6UfLgQZoR0pdEO/V80Nc08rZRK0htv4AtLNBjUONba74SkYU3 tU3Q== X-Received: by 10.68.142.200 with SMTP id ry8mr17693639pbb.136.1440167808798; Fri, 21 Aug 2015 07:36:48 -0700 (PDT) Received: from eychenz ([212.112.178.114]) by smtp.gmail.com with ESMTPSA id d5sm8074612pdn.74.2015.08.21.07.36.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Aug 2015 07:36:48 -0700 (PDT) Message-ID: <1440167797.32163.11.camel@gmail.com> Subject: Thanks & patch From: Hamid Noroozi To: meld-list@gnome.org Date: Fri, 21 Aug 2015 16:36:37 +0200 Content-Type: multipart/mixed; boundary="=-z5FaJ/sf4G41uhnzNIgj" X-Mailer: Evolution 3.16.5 (3.16.5-1.fc22) 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: Fri, 21 Aug 2015 14:36:52 -0000 --=-z5FaJ/sf4G41uhnzNIgj Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Hi all, I'm writing this email to thank you guys for doing such a great job in development and maintenance of such a helpful tool. Also, I wanted to give suggestion as a daily user of Meld. When I'm doing heavy merges, usually the list of files could be very long, which makes me want to sort them based on "Name" or "Location" or "Status". I just created a patch (attached to this email) handling the sort based on "Status" which solves my issue. However, since I'm not a developer, you might want to do it in another fashion. Thank you again & keep up the good work. -- Regards, Hamid --=-z5FaJ/sf4G41uhnzNIgj Content-Disposition: attachment; filename="meld_patch_Hamid.patch" Content-Type: text/x-patch; name="meld_patch_Hamid.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBlNjVlYmE1MTQzNTMwNzEwMTE0NTlkMTBkNmFjNDRhY2FlZmMyNzZiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIYW1pZCBOb3Jvb3ppIDxoYW1pZC5ub3Jvb3ppQGRpZ2l0YWxy b3V0ZS5jb20+CkRhdGU6IEZyaSwgMjEgQXVnIDIwMTUgMTY6MTY6NDEgKzAyMDAKU3ViamVjdDog W1BBVENIXSBDb2x1bW5zIGFyZSBhYmxlIHRvIGJlIHNvcnRlZCBiYXNlZCBvbiBTdGF0dXMuCgot LS0KIG1lbGQvdmN2aWV3LnB5IHwgNSArKysrKwogMSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9u cygrKQoKZGlmZiAtLWdpdCBhL21lbGQvdmN2aWV3LnB5IGIvbWVsZC92Y3ZpZXcucHkKaW5kZXgg NjU1YzZiNS4uMTA4MzJmMSAxMDA2NDQKLS0tIGEvbWVsZC92Y3ZpZXcucHkKKysrIGIvbWVsZC92 Y3ZpZXcucHkKQEAgLTIwMCw2ICsyMDAsMTEgQEAgY2xhc3MgVmNWaWV3KG1lbGRkb2MuTWVsZERv YywgZ25vbWVnbGFkZS5Db21wb25lbnQpOgogICAgICAgICBzZWxmLmxvY2F0aW9uX2NvbHVtbi5i aW5kX3Byb3BlcnR5KAogICAgICAgICAgICAgJ3Zpc2libGUnLCBzZWxmLmFjdGlvbmdyb3VwLmdl dF9hY3Rpb24oIlZjRmxhdHRlbiIpLCAnYWN0aXZlJykKIAorICAgICAgICBzZWxmLm5hbWVfY29s dW1uLnNldF9zb3J0X2NvbHVtbl9pZChUcnVlKQorICAgICAgICBzZWxmLmxvY2F0aW9uX2NvbHVt bi5zZXRfc29ydF9jb2x1bW5faWQoVHJ1ZSkKKyAgICAgICAgc2VsZi5zdGF0dXNfY29sdW1uLnNl dF9zb3J0X2NvbHVtbl9pZChUcnVlKQorICAgICAgICBzZWxmLmV4dHJhX2NvbHVtbi5zZXRfc29y dF9jb2x1bW5faWQoVHJ1ZSkKKwogICAgICAgICBzZWxmLmNvbnNvbGVzdHJlYW0gPSBDb25zb2xl U3RyZWFtKHNlbGYuY29uc29sZXZpZXcpCiAgICAgICAgIHNlbGYubG9jYXRpb24gPSBOb25lCiAg ICAgICAgIHNlbGYudmMgPSBOb25lCi0tIAoyLjQuMwoK --=-z5FaJ/sf4G41uhnzNIgj-- From karl@xtronics.com Sat Aug 22 02:21:21 2015 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 04D61769BC for ; Sat, 22 Aug 2015 02:21:21 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.666 X-Spam-Level: X-Spam-Status: No, score=-2.666 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, RP_MATCHES_RCVD=-0.764, SPF_HELO_PASS=-0.001, 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 jKHOmbYNe5bZ for ; Sat, 22 Aug 2015 02:21:19 +0000 (UTC) X-Greylist: delayed 2153 seconds by postgrey-1.34 at restaurant.gnome.org; Sat, 22 Aug 2015 02:21:19 UTC Received: from smtp.xtronics.com (smtp.xtronics.com [139.146.185.26]) by restaurant.gnome.org (Postfix) with ESMTP id DCD01765AC for ; Sat, 22 Aug 2015 02:21:19 +0000 (UTC) Received: from poland.xtronics.com ([108.243.106.82]) by smtp.xtronics.com with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZSxs4-00074M-EI for meld-list@gnome.org; Fri, 21 Aug 2015 20:45:24 -0500 Received: from [192.168.1.153] by poland.xtronics.com with esmtp (Exim 4.84) (envelope-from ) id 1ZSxry-0007RF-PQ for meld-list@gnome.org; Fri, 21 Aug 2015 20:45:18 -0500 Message-ID: <55D7D42E.4040002@xtronics.com> Date: Fri, 21 Aug 2015 20:45:18 -0500 From: Karl Schmidt User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.8.0 MIME-Version: 1.0 To: meld-list@gnome.org Subject: Collapse-all Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit 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, 22 Aug 2015 02:21:21 -0000 I think there was a way to collapse all folders when doing a directory compare before? Can't find it now? Was it removed? Could it be added? ( I have upgraded to Debian Jessie and find my favorite tool (meld) has changed a lot) I often use meld when upgrading systems looking at /etc - Seems it would be grand if there was a way to re-scan just a single sub-directory. I really appreciate this software - sometimes emails can seem more complaining than I mean - I'm hoping that these features could be considered and hope my feedback is helpful. PS: Again, I don't want to be negative, but the new user interface for selecting folders and files seems less rather than more intuitive. I used to be able to choose one of several recent files/directories to compare.. I used that feature a lot. -------------------------------------------------------------------------------- Karl Schmidt EMail Karl@xtronics.com Transtronics, Inc. WEB https://secure.transtronics.com 3209 West 9th Street Ph (785) 841-3089 Lawrence, KS 66049 FAX (785) 841-3089 Merchandise offered without a price, is sure to cost more than it is worth. -kps -------------------------------------------------------------------------------- From jczhang@kingbase.com.cn Fri Aug 21 08:40:08 2015 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 C67F8768C3 for ; Fri, 21 Aug 2015 08:40:08 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -0.5 X-Spam-Level: X-Spam-Status: No, score=-0.5 tagged_above=-999 required=2 tests=[BAYES_05=-0.5, RCVD_IN_DNSWL_NONE=-0.0001] 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 5KsFPuZaE6UF for ; Fri, 21 Aug 2015 08:40:07 +0000 (UTC) X-Greylist: delayed 478 seconds by postgrey-1.34 at restaurant.gnome.org; Fri, 21 Aug 2015 08:40:06 UTC Received: from regular1.263xmail.com (regular1.263xmail.com [211.150.99.132]) by restaurant.gnome.org (Postfix) with ESMTP id 13D26762A7 for ; Fri, 21 Aug 2015 08:40:05 +0000 (UTC) Received: from jczhang?kingbase.com.cn (unknown [192.168.167.129]) by regular1.263xmail.com (Postfix) with SMTP id 95CE5940A for ; Fri, 21 Aug 2015 16:32:03 +0800 (CST) X-263anti-spam: KSV:0;BIG:0;ABS:1;DNS:0;ATT:0;SPF:S; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ADDR-CHECKED: 0 Received: from [192.168.2.149] (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id A80C8128BB for ; Fri, 21 Aug 2015 16:32:02 +0800 (CST) X-RL-SENDER: jczhang@kingbase.com.cn X-FST-TO: meld-list@gnome.org X-SENDER-IP: 210.56.193.18 X-LOGIN-NAME: jczhang@kingbase.com.cn X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: jczhang@kingbase.com.cn X-DNS-TYPE: 0 Received: from [192.168.2.149] (unknown [210.56.193.18]) by smtp.263.net (Postfix) whith ESMTP id 10131RVJJZG; Fri, 21 Aug 2015 16:32:02 +0800 (CST) Message-ID: <55D6E204.6090302@kingbase.com.cn> Date: Fri, 21 Aug 2015 16:32:04 +0800 From: jczhang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: meld-list@gnome.org Subject: BUG serious Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Sat, 22 Aug 2015 08:06:34 +0000 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, 21 Aug 2015 08:40:08 -0000 hello ! i'm very like the meld and use it for a month ,when i first meet it ,oh ,surprise! so i hope it be stronger! now bug: 1, it can't enconding conveniently! (very important) 2, meld version 3.14 when i input command-meld --help .it trashback and tell me : Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/meld/meldapp.py", line 72, in do_command_line tab = self.parse_args(command_line) File "/usr/lib/python2.7/dist-packages/meld/meldapp.py", line 277, in parse_args if len(args) > 3: UnboundLocalError: local variable 'args' referenced before assignment hope you can reply for me as soon as possible! thank you! From scott.kostyshak@gmail.com Sat Aug 22 16:36:07 2015 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 37DA8769BC for ; Sat, 22 Aug 2015 16:36:07 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.6 X-Spam-Level: X-Spam-Status: No, score=-2.6 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-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 Hka_en-04Vpj for ; Sat, 22 Aug 2015 16:36:05 +0000 (UTC) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by restaurant.gnome.org (Postfix) with ESMTP id AA1487622E for ; Sat, 22 Aug 2015 16:36:05 +0000 (UTC) Received: by lbcbn3 with SMTP id bn3so59145973lbc.2 for ; Sat, 22 Aug 2015 09:36:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:content-type; bh=T6kIFTwRFDGKMBM4uOnwXlpBEn3WKfMpoNBiSLpHCWg=; b=EtNEbh+mrWm1lL8CexYPn8cus+sr0cOV+xD3XhdsronElS5NQSJvxQ6OCHlfqV3VFf B4mLzRT/51yJ1e+LANqppSDIYeFfrUqBM9ofnjXHtpNplq/Ro5+gBnEM4rbaHFQn2qkh jklf3XOS9A8XJKl21PFefd+PyVx6TSZkJxlavZRP2QGYXNbYyOSUevRSdkxvSK3nYAt+ r/RsZx4hg59FT8uqrugtFA2Js66l55fIShNr5HbWpAu+EdWiFIbBOBPzOlsVM0mvyB/+ ZxtI4Ns/T1EVwnAcIIPHys8bKyOhW67lpGm4d1z0c+7WFERpmxmtk/fVvYFzycjYS7kK VzUA== MIME-Version: 1.0 X-Received: by 10.152.22.99 with SMTP id c3mr13320559laf.32.1440261363562; Sat, 22 Aug 2015 09:36:03 -0700 (PDT) Sender: scott.kostyshak@gmail.com Received: by 10.112.54.193 with HTTP; Sat, 22 Aug 2015 09:36:03 -0700 (PDT) Date: Sat, 22 Aug 2015 12:36:03 -0400 X-Google-Sender-Auth: NMxw2wI4X-lqrGcGulMagHZzJyY Message-ID: Subject: Executable bit for setup.py? From: Scott Kostyshak 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, 22 Aug 2015 16:36:07 -0000 Hi, Would it make sense to set the executable bit for setup.py? I prefer to let the executable choose the interpreter. In the case of python, I do not know if python3 is preferred by the program or not, so I let the script choose, which knows best. Any thoughts? Scott From karl@xtronics.com Sat Aug 22 17:00:09 2015 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 7CFE8769BC for ; Sat, 22 Aug 2015 17:00:09 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.785 X-Spam-Level: X-Spam-Status: No, score=-2.785 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, RP_MATCHES_RCVD=-0.883, SPF_HELO_PASS=-0.001, 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 guPmfxIMwu6i for ; Sat, 22 Aug 2015 17:00:08 +0000 (UTC) Received: from smtp.xtronics.com (smtp.xtronics.com [139.146.185.26]) by restaurant.gnome.org (Postfix) with ESMTP id 5ECEA7622E for ; Sat, 22 Aug 2015 17:00:07 +0000 (UTC) Received: from poland.xtronics.com ([108.243.106.82]) by smtp.xtronics.com with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZTC9F-0003HX-Vw for meld-list@gnome.org; Sat, 22 Aug 2015 12:00:06 -0500 Received: from [192.168.1.153] by poland.xtronics.com with esmtp (Exim 4.84) (envelope-from ) id 1ZTC9A-0004kZ-Et for meld-list@gnome.org; Sat, 22 Aug 2015 12:00:00 -0500 Message-ID: <55D8AA90.50400@xtronics.com> Date: Sat, 22 Aug 2015 12:00:00 -0500 From: Karl Schmidt User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.8.0 MIME-Version: 1.0 To: meld-list@gnome.org Subject: Fwd: Re: Collapse-all References: <55D7F279.5030005@laposte.net> In-Reply-To: <55D7F279.5030005@laposte.net> X-Forwarded-Message-Id: <55D7F279.5030005@laposte.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit 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, 22 Aug 2015 17:00:09 -0000 Karl Schmidt a écrit : > I think there was a way to collapse all folders when doing a directory > compare before? Can't find it now? Was it removed? Could it be added? > Yes, and it was removed. Hopefully it will be re-added soon. In the meantime, I'm (almost always) using the latest 1.x version. You can download older versions (which I did.) > I often use meld when upgrading systems looking at /etc - Seems it would > be grand if there was a way to re-scan just a single sub-directory. Still possible, but more awkward to do than before > > PS: Again, I don't want to be negative, but the new user interface for > selecting folders and files seems less rather than more intuitive. I > used to be able to choose one of several recent files/directories to > compare.. I used that feature a lot. Me too. Another reason why I still use the older version. But the new version does have certain enhancements. (Like comparing only file size and or change date, and showing file date and time.) From kai.willadsen@gmail.com Sat Aug 22 21:03:06 2015 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 99B5C769BC for ; Sat, 22 Aug 2015 21:03:06 +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 1CQlJRmcUcCk for ; Sat, 22 Aug 2015 21:03:04 +0000 (UTC) Received: from mail-yk0-f182.google.com (mail-yk0-f182.google.com [209.85.160.182]) by restaurant.gnome.org (Postfix) with ESMTP id D4EF3768CF for ; Sat, 22 Aug 2015 21:03:02 +0000 (UTC) Received: by ykll84 with SMTP id l84so101805964ykl.0 for ; Sat, 22 Aug 2015 14:03:00 -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=fnDeiU79KJDGULATtlMlY6M3IpIhb0qaZbMLcda/r9I=; b=mNyYBLRLZlPzJ4RqbKM/aZpTcBbiN269aQlYdlCSJbU/NLz7PcbBkhJeRXnx1ji72c VFXh7ooB5c4VpM8wXDYHO3rg3RJbfzGaHzLqwYbW22nNog+YU+T/oociHkFATdmTXLrP dyrXTYFKsrif9aIG/4lgiLGVhXr1wS3KajJW8KYzZrGNChRgrUZww7R0k8uwBftho/Gp l7BbYBZbSAoWm+6xfDZANHKpypC+A4eqRGtI5QK/+64dFFh5SJSrV4alx+am6bBlAgJs PTvDp/uFWd2MYQyWyfmH27NoR+t5IAMwhaY3gWGMrFpC4AM9tr00OugeyzbdJXZAASbB KkAA== MIME-Version: 1.0 X-Received: by 10.129.92.8 with SMTP id q8mr21243336ywb.163.1440277380343; Sat, 22 Aug 2015 14:03:00 -0700 (PDT) Received: by 10.13.211.67 with HTTP; Sat, 22 Aug 2015 14:03:00 -0700 (PDT) In-Reply-To: <55D8AA90.50400@xtronics.com> References: <55D7F279.5030005@laposte.net> <55D8AA90.50400@xtronics.com> Date: Sun, 23 Aug 2015 07:03:00 +1000 Message-ID: Subject: Re: Re: Collapse-all From: Kai Willadsen To: Karl Schmidt 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: Sat, 22 Aug 2015 21:03:06 -0000 On 23 August 2015 at 03:00, Karl Schmidt wrote: > Karl Schmidt a =C3=A9crit : >> >> I think there was a way to collapse all folders when doing a directory >> compare before? Can't find it now? Was it removed? Could it be added? >> > Yes, and it was removed. Hopefully it will be re-added soon. > In the meantime, I'm (almost always) using the latest 1.x version. > You can download older versions (which I did.) I don't think this is accurate. To the best of my recollection, I don't think we ever provided a way to collapse all folders. You *could* have collapsed and re-expanded the parent folder, because we incorrectly failed to remember the expansion state... which has been fixed. Can I ask why you want to do this? >> I often use meld when upgrading systems looking at /etc - Seems it would >> be grand if there was a way to re-scan just a single sub-directory. > > Still possible, but more awkward to do than before We've never been able to rescan just part of the tree, so I'm not sure how this has changed at all. Could you maybe explain what you want to do? >> PS: Again, I don't want to be negative, but the new user interface for >> selecting folders and files seems less rather than more intuitive. I >> used to be able to choose one of several recent files/directories to >> compare.. I used that feature a lot. We moved to using the standard GTK+ file chooser a while ago, and its UI is what we get. cheers, Kai From kai.willadsen@gmail.com Sat Aug 22 22:04:56 2015 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 CD08E762B3 for ; Sat, 22 Aug 2015 22:04: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 1Sdpq5UyoNEK for ; Sat, 22 Aug 2015 22:04:55 +0000 (UTC) Received: from mail-yk0-f178.google.com (mail-yk0-f178.google.com [209.85.160.178]) by restaurant.gnome.org (Postfix) with ESMTP id D1F8876287 for ; Sat, 22 Aug 2015 22:04:55 +0000 (UTC) Received: by ykdt205 with SMTP id t205so102916009ykd.1 for ; Sat, 22 Aug 2015 15:04:54 -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=gA5SEfjWgOa79azDDQOajej9hN8znP79hv6wIBkO7n0=; b=ryeLgGgMiqD5hwQoYNNvqtMHNBrCTzUU54YlukEcZknva/1td/aWE7pNgAXPxKFfau RVClx+wQOUYFKh3k55/5szdYjxa5AIgCWanlCiTWUFL4/6KTb6q9QDf4OgsTtDL/1DTP +10NixZofxnejok5eAy0XFVOGAIXeLpTtPel8+6ayptXmU3lCWkcmkgn5qA9noemQFHp nYWNX1W/GVt0iejE22qx3mXRuU2u89pJ66wx1AeAz/ogZmtW4oidsgVNCoz5/qMHnQX0 rtZZqU0Aj1+5L0yM8U1D3/xiq8teUVAelCqx2S0Bjd7J/G/KZtp4vgEg9xNnwityBfOO hjDg== MIME-Version: 1.0 X-Received: by 10.13.222.1 with SMTP id h1mr21464375ywe.174.1440281094286; Sat, 22 Aug 2015 15:04:54 -0700 (PDT) Received: by 10.13.211.67 with HTTP; Sat, 22 Aug 2015 15:04:54 -0700 (PDT) In-Reply-To: References: Date: Sun, 23 Aug 2015 08:04:54 +1000 Message-ID: Subject: Re: Executable bit for setup.py? From: Kai Willadsen To: Scott Kostyshak 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: Sat, 22 Aug 2015 22:04:56 -0000 On 23 August 2015 at 02:36, Scott Kostyshak wrote: > Hi, > > Would it make sense to set the executable bit for setup.py? I prefer > to let the executable choose the interpreter. In the case of python, I > do not know if python3 is preferred by the program or not, so I let > the script choose, which knows best. > > Any thoughts? This seems sensible to me, so I just pushed the change. I also made setup.py specify python2 as its interpreter, though I kind of hope that either would work in this case. cheers, Kai From kai.willadsen@gmail.com Sat Aug 22 23:57:55 2015 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 056F776287 for ; Sat, 22 Aug 2015 23:57:55 +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 FD30tCBt4DMC for ; Sat, 22 Aug 2015 23:57:54 +0000 (UTC) Received: from mail-yk0-f181.google.com (mail-yk0-f181.google.com [209.85.160.181]) by restaurant.gnome.org (Postfix) with ESMTP id 40204762AF for ; Sat, 22 Aug 2015 23:57:54 +0000 (UTC) Received: by ykbi184 with SMTP id i184so103569113ykb.2 for ; Sat, 22 Aug 2015 16:57:52 -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=JzLxkiQUAuOEOL3yTw4g2XtOLnMFG1iwUxNDqSPLoZI=; b=hcEjCpwaOn8DXpEBWWy/qbzKQccvfxZGg7yoxIQxFQMt9+S/oY8qAIs5VMlTDfM3eY 0bY064MrK3kqFOBs+Ati9oCKrrqIQqEsRbc3+tcqy3yRRRX7+OwVOR/WfgsmD0ZemCXY ReebXdG4jwKOJ5S1LzFYS6bXSPb+9w9Fa1yhCiBVskuY5iI3dxzbFsvGYx+rTrajoIMb vbWwqyq4eUWHhX4mbRDHGWl5xqKNNUFlHEscw8lkh0iY6PXJUfbVjCvK1Pz46n42bwNf vUZT7FujBvDvY23wcGwL5+sP0DpIunNlA2eqsO/pipXv4pE/uZ8gd/scFYXLSjxCkYEc JV4g== MIME-Version: 1.0 X-Received: by 10.129.97.135 with SMTP id v129mr21776166ywb.78.1440287872594; Sat, 22 Aug 2015 16:57:52 -0700 (PDT) Received: by 10.13.211.67 with HTTP; Sat, 22 Aug 2015 16:57:52 -0700 (PDT) In-Reply-To: <55D6E204.6090302@kingbase.com.cn> References: <55D6E204.6090302@kingbase.com.cn> Date: Sun, 23 Aug 2015 09:57:52 +1000 Message-ID: Subject: Re: BUG serious From: Kai Willadsen To: jczhang 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: Sat, 22 Aug 2015 23:57:55 -0000 On 21 August 2015 at 18:32, jczhang wrote: > hello ! > i'm very like the meld and use it for a month ,when i first meet it ,oh > ,surprise! > so i hope it be stronger! > now bug: > 1, it can't enconding conveniently! (very important) Yes. At the moment, you need to add encodings to gsettings. e.g., gsettings get org.gnome.meld detect-encodings gsettings set org.gnome.meld detect-encodings "['latin1', 'utf8']" When Meld 3.14.1 comes out, we will also always try the current locale encoding, which may help. I would like to be able to let the user specify the encoding in the UI, if it doesn't load correctly... but this has been difficult. > 2, meld version 3.14 > when i input command-meld --help .it trashback and > tell me : > Traceback (most recent call last): > File "/usr/lib/python2.7/dist-packages/meld/meldapp.py", line 72, in > do_command_line > tab = self.parse_args(command_line) > File "/usr/lib/python2.7/dist-packages/meld/meldapp.py", line 277, in > parse_args > if len(args) > 3: > UnboundLocalError: local variable 'args' referenced before assignment I've just fixed this in the 3.14 branch and master. There was a problem with combining optparse's unicode handling and our unicode handling, which I've fixed in the ugliest possible way. Thanks for the bug report. cheers, Kai From scott.kostyshak@gmail.com Sun Aug 23 03:01:44 2015 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 7D00E762AF for ; Sun, 23 Aug 2015 03:01:44 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.6 X-Spam-Level: X-Spam-Status: No, score=-2.6 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-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 6G9ND5KBKeK2 for ; Sun, 23 Aug 2015 03:01:43 +0000 (UTC) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com [209.85.215.51]) by restaurant.gnome.org (Postfix) with ESMTP id 628517622E for ; Sun, 23 Aug 2015 03:01:43 +0000 (UTC) Received: by lahi9 with SMTP id i9so59620062lah.2 for ; Sat, 22 Aug 2015 20:01:41 -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:content-type; bh=22VfdyrWH/XqVB/S7xgTnDO8LSX4twIfR+ojr8MqfZI=; b=nminNDsLvQaf8Run36ccGz11yT00zNJfZgS5L6CMSAOEJrjskr9PhD030q21ZcfsRp PS3Vo/hCGrlRYrScY2IHGf1ze2mHJl71UXwrIQNfs75JiJanoAOt8bg8+eTUpE3Xt51+ aIhE9Y1XCS4/UAcwBVf6Cr4xphZyJRr/1TQyeoR5ChHqYOBndr6kygv89HjtxnXYpAmY PdwnSt/wdot87QWevb6oBRc0EBjGHyavDkhDmHFiOhz7u48otpK9hUYMxfb/9uJPLiz6 ium2lVb5o1wWmW4GqkqGJjWOgvyJEYoeVl+qRK/FqIPJwDYNa0sAxX9ai0kTbBBLMDRD TnGA== MIME-Version: 1.0 X-Received: by 10.112.161.137 with SMTP id xs9mr14575351lbb.4.1440298901284; Sat, 22 Aug 2015 20:01:41 -0700 (PDT) Sender: scott.kostyshak@gmail.com Received: by 10.112.54.193 with HTTP; Sat, 22 Aug 2015 20:01:41 -0700 (PDT) In-Reply-To: References: Date: Sat, 22 Aug 2015 23:01:41 -0400 X-Google-Sender-Auth: Dhu0DHyVVOINZCjtQro_bvtL39o Message-ID: Subject: Re: Executable bit for setup.py? From: Scott Kostyshak 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: Sun, 23 Aug 2015 03:01:44 -0000 On Sat, Aug 22, 2015 at 6:04 PM, Kai Willadsen wrote: > On 23 August 2015 at 02:36, Scott Kostyshak wrote: >> Hi, >> >> Would it make sense to set the executable bit for setup.py? I prefer >> to let the executable choose the interpreter. In the case of python, I >> do not know if python3 is preferred by the program or not, so I let >> the script choose, which knows best. >> >> Any thoughts? > > This seems sensible to me, so I just pushed the change. I also made > setup.py specify python2 as its interpreter, though I kind of hope > that either would work in this case. Thanks, as always, Kai! Scott From kai.willadsen@gmail.com Tue Aug 25 21:27:22 2015 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 C6BF5769B8 for ; Tue, 25 Aug 2015 21:27:22 +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 wuJ2Dmwa3BKO for ; Tue, 25 Aug 2015 21:27:22 +0000 (UTC) Received: from mail-yk0-f170.google.com (mail-yk0-f170.google.com [209.85.160.170]) by restaurant.gnome.org (Postfix) with ESMTP id 17EAD7694A for ; Tue, 25 Aug 2015 21:27:22 +0000 (UTC) Received: by ykfw73 with SMTP id w73so168474517ykf.3 for ; Tue, 25 Aug 2015 14:27:20 -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=FSM0yfqjZcEzmZ+DkHV9aNuQsAe3JGPjGp32c5/CXUg=; b=a/p9edqeU9dEokXsqvq+JLiz2z7tEim1RqtBGXw+B1CoQc6Vrm3NDRwt4qNidmNPs/ whusHUVSs1BuxVPKjGkNceWEO1kCGNYc87PPrILFjCa2/WTdHD7xfQcf7crny1rshNIJ Z3W6hDYgIVcOvxkn9pqad36NUCY+8hIIH+S8Wq4VX2KZkoSHRS2FzzBer/mmh/bzkLig uiZw9BpDkfVp32N/JCTf2TwqGrPwB6pz3GH0vWElpyaxtXmA69WUjnRZjEKlotzAaj/r 9GKcghqoDea0qTyk5ZW0Rv+cAzG0OU/o5EBtVvfTolkD2XEmWsP67f27CH3+HzN2vE02 glaQ== MIME-Version: 1.0 X-Received: by 10.129.92.8 with SMTP id q8mr40507104ywb.163.1440538040705; Tue, 25 Aug 2015 14:27:20 -0700 (PDT) Received: by 10.13.211.67 with HTTP; Tue, 25 Aug 2015 14:27:20 -0700 (PDT) In-Reply-To: <1440167797.32163.11.camel@gmail.com> References: <1440167797.32163.11.camel@gmail.com> Date: Wed, 26 Aug 2015 07:27:20 +1000 Message-ID: Subject: Re: Thanks & patch From: Kai Willadsen To: Hamid Noroozi Content-Type: multipart/alternative; boundary=001a114d8b8c33bab3051e2966ea 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, 25 Aug 2015 21:27:22 -0000 --001a114d8b8c33bab3051e2966ea Content-Type: text/plain; charset=UTF-8 On 22 August 2015 at 00:36, Hamid Noroozi wrote: > Hi all, > > I'm writing this email to thank you guys for doing such a great job in > development and maintenance of such a helpful tool. > > Also, I wanted to give suggestion as a daily user of Meld. > > When I'm doing heavy merges, usually the list of files could be very > long, which makes me want to sort them based on "Name" or "Location" or > "Status". > > I just created a patch (attached to this email) handling the sort based > on "Status" which solves my issue. However, since I'm not a developer, > you might want to do it in another fashion. > Thanks for the suggestion and the patch! The `set_sort_column_id()` function takes a column ID though, so that instead of True those lines will need to be COL_TEXT, COL_LOCATION, COL_STATUS, and COL_OPTIONS. I'm slightly worried that sorting like this will affect something else we're doing (like tracking tree paths or something) when not in flattened mode, but I'll try and find some time to look at this. cheers, Kai --001a114d8b8c33bab3051e2966ea Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On 2= 2 August 2015 at 00:36, Hamid Noroozi <eychenz@gmail.com> wr= ote:
Hi all,

I'm writing this email to thank you guys for doing such a great job in<= br> development and maintenance of such a helpful tool.

Also, I wanted to give suggestion as a daily user of Meld.

When I'm doing heavy merges, usually the list of files could be very long, which makes me want to sort them based on "Name" or "L= ocation" or
"Status".

I just created a patch (attached to this email) handling the sort based
on "Status" which solves my issue. However, since I'm not a d= eveloper,
you might want to do it in another fashion.

Thanks for the suggestion and the patch! The `s= et_sort_column_id()` function takes a column ID though, so that instead of = True those lines will need to be COL_TEXT, COL_LOCATION, COL_STATUS, and CO= L_OPTIONS.

I'm slightly worried that sorting like this will affe= ct something else we're doing (like tracking tree paths or something) w= hen not in flattened mode, but I'll try and find some time to look at t= his.

cheers,
Kai
--001a114d8b8c33bab3051e2966ea-- From gcgm-meld-list@m.gmane.org Wed Aug 26 16:42:41 2015 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 C6C9C7684D for ; Wed, 26 Aug 2015 16:42:41 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -3.126 X-Spam-Level: X-Spam-Status: No, score=-3.126 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_LOW=-0.7, RP_MATCHES_RCVD=-1.426, SPF_HELO_PASS=-0.001, 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 jxo7UaK0NtBM for ; Wed, 26 Aug 2015 16:42:40 +0000 (UTC) Received: from plane.gmane.org (plane.gmane.org [80.91.229.3]) by restaurant.gnome.org (Postfix) with ESMTP id 85C437657B for ; Wed, 26 Aug 2015 16:42:40 +0000 (UTC) Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ZUdmX-0000w1-HQ for meld-list@gnome.org; Wed, 26 Aug 2015 18:42:37 +0200 Received: from 67-130-15-94.dia.static.qwest.net ([67.130.15.94]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 26 Aug 2015 18:42:37 +0200 Received: from grant.b.edwards by 67-130-15-94.dia.static.qwest.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 26 Aug 2015 18:42:37 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: meld-list@gnome.org From: Grant Edwards Subject: Can't copy/paste from meld Date: Wed, 26 Aug 2015 16:42:23 +0000 (UTC) Lines: 12 Message-ID: X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 67-130-15-94.dia.static.qwest.net User-Agent: slrn/1.0.2 (Linux) 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, 26 Aug 2015 16:42:41 -0000 I've noticed that since I upgraded from 1.x, I can no longer select a snippet of text from meld and paste it into another window like I can from every other application on my system. Is there something I can do to re-enable the standard X11 compatible select/middle-click feature? Is 1.x still being maintained? I sure miss it... -- Grant Edwards grant.b.edwards Yow! ... the MYSTERIANS are at in here with my CORDUROY gmail.com SOAP DISH!! From David.Rabel@NoreSoft.com Thu Aug 27 17:44:52 2015 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 3CE5E7693F for ; Thu, 27 Aug 2015 17:44:52 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-999 required=2 tests=[BAYES_00=-1.9] 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 P-Dzv6RoZbdk for ; Thu, 27 Aug 2015 17:44:51 +0000 (UTC) X-Greylist: delayed 514 seconds by postgrey-1.34 at restaurant.gnome.org; Thu, 27 Aug 2015 17:44:50 UTC Received: from xararar.netbeat.de (xararar.netbeat.de [46.151.164.1]) by restaurant.gnome.org (Postfix) with ESMTP id CC907768C3 for ; Thu, 27 Aug 2015 17:44:50 +0000 (UTC) Received: from [192.168.178.68] (p579A9B49.dip0.t-ipconnect.de [87.154.155.73]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mailout1.netbeat.de (Postfix) with ESMTPSA id BA6B675C474 for ; Thu, 27 Aug 2015 19:36:15 +0200 (CEST) Message-ID: <55DF4A8D.1060902@NoreSoft.com> Date: Thu, 27 Aug 2015 19:36:13 +0200 From: David Rabel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.8.0 MIME-Version: 1.0 To: meld-list@gnome.org Subject: Getting involved in meld development Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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, 27 Aug 2015 17:44:52 -0000 Hello everybody, I'm using meld a lot and like it a lot. I'm a software developer and I want to get involved in meld development to return something to the community. Is there something like a point to start or easyhacks to get into the code easier? And btw, there is one feature that I really really miss in meld and that's to collapse equal lines in file diff. (Or did I just not find out how it works yet?) I don't know if you want such a feature or not. But if so and after getting to know the code a littler more I would love to work on implementing something like this. Kind Regards, David From scott.kostyshak@gmail.com Thu Aug 27 21:35:10 2015 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 52E5076981 for ; Thu, 27 Aug 2015 21:35:10 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.6 X-Spam-Level: X-Spam-Status: No, score=-2.6 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-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 MNzNSnESWDnV for ; Thu, 27 Aug 2015 21:35:09 +0000 (UTC) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com [209.85.217.178]) by restaurant.gnome.org (Postfix) with ESMTP id 1D612768C3 for ; Thu, 27 Aug 2015 21:35:08 +0000 (UTC) Received: by lbbpu9 with SMTP id pu9so19571216lbb.3 for ; Thu, 27 Aug 2015 14:35:07 -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:content-type; bh=bWGLi8+Dh2h5Pf7kkHEGDmyrs/UvlBcu9kRqJiIMLZY=; b=0NMoiTrUDtJoy1hcq8h/P6JqBONwy0ROtKYPDPdOqW8qckUanszoPJY1nos00ilXSh u3uMWT9+eL/1/yMKM939mZyquhy3V1cGSwcJ96ZuuxidRrCaIWqSeXpsOvNuENc/1aat Eoj5ynBJDwCAqI2hkwwOPtxOg22YEuswKttkV3d4Gfe/8Un8WdCXB7hvYddMw4jNA6i3 u2uZmceyuCc18WwDeKyAyZ/6hWj7Xv9fK0BOOoX3Sh/eWEm5q21dN+mNHoZpUFqHNG7e f87XxbBol5pM1darAVIldNB6xPqHBXwWqYuoCNhsrCje7s9i64U5ptstBiswHwysGPTV g/VQ== MIME-Version: 1.0 X-Received: by 10.152.5.135 with SMTP id s7mr3172409las.75.1440711306982; Thu, 27 Aug 2015 14:35:06 -0700 (PDT) Sender: scott.kostyshak@gmail.com Received: by 10.112.54.193 with HTTP; Thu, 27 Aug 2015 14:35:06 -0700 (PDT) In-Reply-To: <55DF4A8D.1060902@NoreSoft.com> References: <55DF4A8D.1060902@NoreSoft.com> Date: Thu, 27 Aug 2015 17:35:06 -0400 X-Google-Sender-Auth: q2SIn_moG76xYD7X7qjVF-v-dO0 Message-ID: Subject: Re: Getting involved in meld development From: Scott Kostyshak 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: Thu, 27 Aug 2015 21:35:10 -0000 On Thu, Aug 27, 2015 at 1:36 PM, David Rabel wrote: > Hello everybody, > > I'm using meld a lot and like it a lot. I'm a software developer and I > want to get involved in meld development to return something to the > community. Is there something like a point to start or easyhacks to get > into the code easier? > > And btw, there is one feature that I really really miss in meld and > that's to collapse equal lines in file diff. (Or did I just not find out > how it works yet?) > I don't know if you want such a feature or not. But if so and after > getting to know the code a littler more I would love to work on > implementing something like this. > > Kind Regards, > David Hi David, I'm not involved in meld development, but I'm involved in other open source projects. First, as a meld user, thanks for your interest in improving meld! Second, I think it's great that you have a goal in mind, which is the feature that you described. Third, when wanting to join the development of an open source project, I think it's interesting (but not necessary) to talk a little bit about your background. As for specific questions, what is your programming experience? What is your OS? Have you worked on any other open source software? Are you familiar with git? Best of luck, Scott From David.Rabel@NoreSoft.com Fri Aug 28 10:44:40 2015 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 E2089768FD for ; Fri, 28 Aug 2015 10:44:40 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-999 required=2 tests=[BAYES_00=-1.9] 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 2ORobDNwIThz for ; Fri, 28 Aug 2015 10:44:38 +0000 (UTC) Received: from xakeker.netbeat.de (xakeker.netbeat.de [46.151.164.182]) by restaurant.gnome.org (Postfix) with ESMTP id 76980762AF for ; Fri, 28 Aug 2015 10:44:38 +0000 (UTC) Received: from [192.168.178.68] (p579A82AC.dip0.t-ipconnect.de [87.154.130.172]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mailout1.netbeat.de (Postfix) with ESMTPSA id 742D275C29A for ; Fri, 28 Aug 2015 12:44:37 +0200 (CEST) Message-ID: <55E03B95.5070302@NoreSoft.com> Date: Fri, 28 Aug 2015 12:44:37 +0200 From: David Rabel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.8.0 MIME-Version: 1.0 To: meld-list@gnome.org Subject: Re: Getting involved in meld development References: <55DF4A8D.1060902@NoreSoft.com> In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit 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, 28 Aug 2015 10:44:40 -0000 Hi Scott, thank you for that hint. I'll try to answer your questions. :) > As for specific questions, what is your programming experience? I've mainly written software for microcontrollers in C professionally. I have a little bit experience in C++, Java and Python. I would say in this languages I know enough to look things up. I know the basics of GTK+ as well. > What is your OS? Debian 8.1 > Have you worked on any other open source software? Not too much. Except for smaller patches I wrote the small tool heating-master [1] for a home automation project [2]. > Are you familiar with git? Yes. [1] https://savannah.nongnu.org/projects/heating-master [2] http://www.noresoft.com/heating_control_en.html Kind Regards, David On 27.08.2015 23:35, Scott Kostyshak wrote: > On Thu, Aug 27, 2015 at 1:36 PM, David Rabel wrote: >> Hello everybody, >> >> I'm using meld a lot and like it a lot. I'm a software developer and I >> want to get involved in meld development to return something to the >> community. Is there something like a point to start or easyhacks to get >> into the code easier? >> >> And btw, there is one feature that I really really miss in meld and >> that's to collapse equal lines in file diff. (Or did I just not find out >> how it works yet?) >> I don't know if you want such a feature or not. But if so and after >> getting to know the code a littler more I would love to work on >> implementing something like this. >> >> Kind Regards, >> David > > Hi David, > > I'm not involved in meld development, but I'm involved in other open > source projects. First, as a meld user, thanks for your interest in > improving meld! Second, I think it's great that you have a goal in > mind, which is the feature that you described. Third, when wanting to > join the development of an open source project, I think it's > interesting (but not necessary) to talk a little bit about your > background. As for specific questions, what is your programming > experience? What is your OS? Have you worked on any other open source > software? Are you familiar with git? > > Best of luck, > > Scott > _______________________________________________ > meld-list mailing list > meld-list@gnome.org > https://mail.gnome.org/mailman/listinfo/meld-list > > From karl@xtronics.com Sat Aug 29 05:28:05 2015 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 78A1076A0B for ; Sat, 29 Aug 2015 05:28:05 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -3.329 X-Spam-Level: X-Spam-Status: No, score=-3.329 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, RP_MATCHES_RCVD=-1.427, SPF_HELO_PASS=-0.001, 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 4pO1BxAgCfG8 for ; Sat, 29 Aug 2015 05:28:04 +0000 (UTC) Received: from smtp.xtronics.com (smtp.xtronics.com [139.146.185.26]) by restaurant.gnome.org (Postfix) with ESMTP id D89BE76A04 for ; Sat, 29 Aug 2015 05:28:04 +0000 (UTC) Received: from poland.xtronics.com ([108.243.106.82]) by smtp.xtronics.com with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZVYgM-00028B-QY for meld-list@gnome.org; Sat, 29 Aug 2015 00:28:02 -0500 Received: from [192.168.1.153] by poland.xtronics.com with esmtp (Exim 4.84) (envelope-from ) id 1ZVYgL-0001rV-4H for meld-list@gnome.org; Sat, 29 Aug 2015 00:28:01 -0500 Message-ID: <55E142E1.8000207@xtronics.com> Date: Sat, 29 Aug 2015 00:28:01 -0500 From: Karl Schmidt User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.8.0 MIME-Version: 1.0 To: meld-list Subject: Re: Collapse-all References: <55D7F279.5030005@laposte.net> <55D8AA90.50400@xtronics.com> In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit 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, 29 Aug 2015 05:28:05 -0000 On 08/22/2015 04:03 PM, Kai Willadsen wrote: > On 23 August 2015 at 03:00, Karl Schmidt wrote: >> Karl Schmidt a écrit : >>> >>> I think there was a way to collapse all folders when doing a directory >>> compare before? Can't find it now? Was it removed? Could it be added? >>> >> Yes, and it was removed. Hopefully it will be re-added soon. >> In the meantime, I'm (almost always) using the latest 1.x version. >> You can download older versions (which I did.) > > I don't think this is accurate. To the best of my recollection, I > don't think we ever provided a way to collapse all folders. You > *could* have collapsed and re-expanded the parent folder, because we > incorrectly failed to remember the expansion state... which has been > fixed. > > Can I ask why you want to do this? Apparently, I was enjoying the effects of that bug.. In migrating systems we often look at /etc and finding things in the order needed is much faster if the directories are all closed - otherwise it ends up being a very long list to scroll though and a pain to close the folders not needed at that time. (I'm pretty sure others use meld for the same job.) It sure would be cool to have a keystroke that would collapse-all. -- -------------------------------------------------------------------------------- Link to our website and get free US-48 shipping on your next order. Karl Schmidt EMail Karl@xtronics.com Transtronics, Inc. WEB https://secure.transtronics.com 3209 West 9th Street Ph (785) 841-3089 Lawrence, KS 66049 FAX (785) 841-3089 Why are so many spending time watching dark movies about hopelessness, the macabre, and perversion; why are they reading books about unfaithfulness and self destruction? Why is nothing uplifting, also considered 'cool' or entertaining? -kps -------------------------------------------------------------------------------- From kai.willadsen@gmail.com Sat Aug 29 20:56:22 2015 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 9629B76A6C for ; Sat, 29 Aug 2015 20:56:22 +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 Ej_mFb1o8sZ4 for ; Sat, 29 Aug 2015 20:56:21 +0000 (UTC) Received: from mail-yk0-f177.google.com (mail-yk0-f177.google.com [209.85.160.177]) by restaurant.gnome.org (Postfix) with ESMTP id 24BF976492 for ; Sat, 29 Aug 2015 20:56:20 +0000 (UTC) Received: by ykey204 with SMTP id y204so14248482yke.3 for ; Sat, 29 Aug 2015 13:56:19 -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=f33a9EAZcNSGDazO51YQBnYKpwALFsk1y6SGB36IS0c=; b=nHUqIgRMa0PqUtdQSs6tahsOf5LsUR3QZUQ3pGHOcDcNAIbH1suWGqGRBA/BX6Nb4y v0nWh3tKdHCUGNHJVCtAU2iLDIjlWVtCGyh+gmTFuj15pBSo+P8bmHN7N5H9mb0/yatG Jx+qRnI3te99l+XRwhyDv+jqa0ILpm5Ne2VfFd2R+aGQ3NC5zvaLJ03jBUOQdqwiT+Hp 5aEwEPN2IL8crgdlu456U5a+SMgnGr+Qe4HybgPvAprJfheNCsB9xNa0Qir2nHoWr08S 0sVDj+gny/icD6TkS8stL8OVUQC6MYsVJPuu/sStdVm8IrgeZlvtRFN50kTG0noaiMOQ gYLw== MIME-Version: 1.0 X-Received: by 10.170.155.9 with SMTP id w9mr7742973ykc.42.1440881779358; Sat, 29 Aug 2015 13:56:19 -0700 (PDT) Received: by 10.13.194.67 with HTTP; Sat, 29 Aug 2015 13:56:19 -0700 (PDT) In-Reply-To: References: Date: Sun, 30 Aug 2015 06:56:19 +1000 Message-ID: Subject: Re: Can't copy/paste from meld From: Kai Willadsen To: Grant Edwards Content-Type: multipart/alternative; boundary=001a113a75f29f4877051e796e16 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, 29 Aug 2015 20:56:22 -0000 --001a113a75f29f4877051e796e16 Content-Type: text/plain; charset=UTF-8 On 27 August 2015 at 02:42, Grant Edwards wrote: > I've noticed that since I upgraded from 1.x, I can no longer select a > snippet of text from meld and paste it into another window like I can > from every other application on my system. Is there something I can > do to re-enable the standard X11 compatible select/middle-click > feature? > We don't do anything to disable this, and it works fine for me. I know there's some GTK+ settings for primary clipboard support, but best I know they all default to on, so as a best guess I'd be looking to see whether your distribution has customised GTK+ 3 settings somehow. If not and we're somehow messing something up then that's a bug... I would want primary to work. > Is 1.x still being maintained? I sure miss it... > It's not, but it's in exactly the same state that it always was. cheers, Kai --001a113a75f29f4877051e796e16 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
--001a113a75f29f4877051e796e16-- From kai.willadsen@gmail.com Sat Aug 29 23:13:00 2015 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 D2FB976A86 for ; Sat, 29 Aug 2015 23:13:00 +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 hWtPJoCWJZFM for ; Sat, 29 Aug 2015 23:12:59 +0000 (UTC) Received: from mail-yk0-f180.google.com (mail-yk0-f180.google.com [209.85.160.180]) by restaurant.gnome.org (Postfix) with ESMTP id EE29D76492 for ; Sat, 29 Aug 2015 23:12:58 +0000 (UTC) Received: by ykey204 with SMTP id y204so15665831yke.3 for ; Sat, 29 Aug 2015 16:12: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=/lcfFrXUfeg/vQhceyQKyJfvdo7L/Il9s/L5JnDmpAg=; b=cnewEj/C1Qko4BiVfQVWV02BNu48jaJbYAZPv756cXyULpmCdf29tD+zAL9SewUUpj 3XRR6NP75mt/kfKo1HLDJNcRNnYWylxGKxtjLMwKUAXY6nslWHassySebraCVgc+4N95 lw0ug6lus+UZ0cb5DVMtRrH9nM+v8FF+1AeTWv1yyiC2xGmR2vbQIFNtq40VM3o2Jrk2 b3iPYsT82dMKbw90tWszkgtYQxzexPFinblgOJVoi6pvf9eGNvpzJ4HQxfQh0kFxQU12 yiaLkuow/t2NsuvpnpyMkKGNV7KXSISzvGR35vnnYJDsAl7QRV80P1Ue8YgbBViFd+S7 aZTg== MIME-Version: 1.0 X-Received: by 10.170.61.70 with SMTP id d67mr13310095ykd.121.1440889977175; Sat, 29 Aug 2015 16:12:57 -0700 (PDT) Received: by 10.13.194.67 with HTTP; Sat, 29 Aug 2015 16:12:57 -0700 (PDT) In-Reply-To: <55DF4A8D.1060902@NoreSoft.com> References: <55DF4A8D.1060902@NoreSoft.com> Date: Sun, 30 Aug 2015 09:12:57 +1000 Message-ID: Subject: Re: Getting involved in meld development From: Kai Willadsen To: David Rabel Content-Type: multipart/alternative; boundary=001a11398a444005e8051e7b570f 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, 29 Aug 2015 23:13:00 -0000 --001a11398a444005e8051e7b570f Content-Type: text/plain; charset=UTF-8 On 28 August 2015 at 03:36, David Rabel wrote: > Hello everybody, > > I'm using meld a lot and like it a lot. I'm a software developer and I > want to get involved in meld development to return something to the > community. Is there something like a point to start or easyhacks to get > into the code easier? > There wasn't! but there is now. I've just gone through to try and find easier bugs, and while I've come up fairly thin, I've marked a few things with the 'gnome-love' keyword: https://bugzilla.gnome.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=gnome-love%2C%20&keywords_type=allwords&list_id=57976&product=meld&query_format=advanced As a general suggestion, it's probably worth picking a single subsystem (i.e., file, folder, version, or the app glue) and familiarising yourself with that. The code for file, folder and version control comparisons is quite distinct, and each has its own idiosyncrasies. In terms of what *not* to pick up, I'd suggest not looking at anything that involves the words 'encoding' or 'newline', unless you really like pain. I'm also in the middle of moving to using GtkSourceView's file loader and saver for our file handling, so anything that touches those areas isn't really worth checking out just yet. There are quite a lot of bugs in the tracker that are there because they have a reasonable use case, but have no good UI, or no user-exposed ABI suggestions that I'd be happy to commit to. Often these are relatively simple from a coding point-of-view, but they need someone to come up with a plan and make a convincing argument that this is a good idea. If you (or anyone else) would like to ask questions here, on bugzilla, or on private email about how to approach certain bugs or features, then I'll be as responsive as I can. Please, please do ask questions. And btw, there is one feature that I really really miss in meld and > that's to collapse equal lines in file diff. (Or did I just not find out > how it works yet?) > I don't know if you want such a feature or not. But if so and after > getting to know the code a littler more I would love to work on > implementing something like this. > I'd be interested in seeing this. For me, the blocking issue for a feature like this is always going to be: how will this be exposed to the user? There's an old bug report asking for (I think) pretty much what you're suggesting (https://bugzilla.gnome.org/show_bug.cgi?id=664624) so maybe check that out in case it helps at all. Also, some experience with GTK+ (as you mentioned in your other reply) is really nice to have. The vast majority of Meld's code requires GTK+ knowledge sooner or later, even if it's only to understand the text buffer model or the tree store. cheers, Kai --001a11398a444005e8051e7b570f Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On 2= 8 August 2015 at 03:36, David Rabel <David.Rabel@noresoft.com&g= t; wrote:
Hello= everybody,

I'm using meld a lot and like it a lot. I'm a software developer an= d I
want to get involved in meld development to return something to the
community. Is there something like a point to start or easyhacks to get
into the code easier?

There wasn't!= but there is now. I've just gone through to try and find easier bugs, = and while I've come up fairly thin, I've marked a few things with t= he 'gnome-love' keyword:
https://bugzilla.gnome.org/buglist.c= gi?bug_status=3DUNCONFIRMED&bug_status=3DNEW&bug_status=3DASSIGNED&= amp;bug_status=3DREOPENED&bug_status=3DNEEDINFO&keywords=3Dgnome-lo= ve%2C%20&keywords_type=3Dallwords&list_id=3D57976&product=3Dmel= d&query_format=3Dadvanced

As a general suggestion, it&#= 39;s probably worth picking a single=20 subsystem (i.e., file, folder, version, or the app glue) and familiarising = yourself with that. The code for file,=20 folder and version control comparisons is quite distinct, and each has=20 its own idiosyncrasies. In terms of what *not* to pick up, I'd suggest= =20 not looking at anything that involves the words 'encoding' or '= newline', unless you really like pain. I'm also in the middle of moving to using= GtkSourceView's file loader and saver for our file handling, so anythi= ng that touches those areas isn't really worth checking out just yet.

There are quite a lot of bugs = in the tracker that are there because they have a reasonable use case, but = have no good UI, or no user-exposed ABI suggestions that I'd be happy t= o commit to. Often these are relatively simple from a coding point-of-view,= but they need someone to come up with a plan and make a convincing argumen= t that this is a good idea.

If you (or anyone else) would like to ask questions here, on bugzilla,= or on private email about how to approach certain bugs or features, then I= 'll be as responsive as I can. Please, please do ask questions.

And btw, there is one feature that I really really miss in meld and
that's to collapse equal lines in file diff. (Or did I just not find ou= t
how it works yet?)
I don't know if you want such a feature or not. But if so and after
getting to know the code a littler more I would love to work on
implementing something like this.

I'd be interested in seeing this. For me, the blockin= g issue for a feature like this is always going to be: how will this be exp= osed to the user? There's an old bug report asking for (I think) pretty= much what you're suggesting (https://bugzilla.gnome.org/show_bug.cgi?id=3D664624<= /a>) so maybe check that out in case it helps at all.


--001a11398a444005e8051e7b570f-- From David.Rabel@NoreSoft.com Sun Aug 30 17:06:18 2015 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 5A0A676569 for ; Sun, 30 Aug 2015 17:06:18 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-999 required=2 tests=[BAYES_00=-1.9] 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 Swo5QaQ97_wW for ; Sun, 30 Aug 2015 17:06:16 +0000 (UTC) Received: from xaxeber.netbeat.de (xaxeber.netbeat.de [46.151.164.206]) by restaurant.gnome.org (Postfix) with ESMTP id 4CB6B76490 for ; Sun, 30 Aug 2015 17:06:16 +0000 (UTC) Received: from [192.168.178.68] (p508FE53A.dip0.t-ipconnect.de [80.143.229.58]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mailout2.netbeat.de (Postfix) with ESMTPSA id EE2D4C7C1CC for ; Sun, 30 Aug 2015 19:06:16 +0200 (CEST) Message-ID: <55E33809.50202@NoreSoft.com> Date: Sun, 30 Aug 2015 19:06:17 +0200 From: David Rabel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.8.0 MIME-Version: 1.0 To: meld-list@gnome.org Subject: Re: Getting involved in meld development References: <55DF4A8D.1060902@NoreSoft.com> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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, 30 Aug 2015 17:06:18 -0000 Hi Kai, thank you very much for your Email! On 30.08.2015 01:12, Kai Willadsen wrote: > On 28 August 2015 at 03:36, David Rabel wrote: > >> Hello everybody, >> >> I'm using meld a lot and like it a lot. I'm a software developer and I >> want to get involved in meld development to return something to the >> community. Is there something like a point to start or easyhacks to get >> into the code easier? >> > > There wasn't! but there is now. I've just gone through to try and find > easier bugs, and while I've come up fairly thin, I've marked a few things > with the 'gnome-love' keyword: > https://bugzilla.gnome.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=gnome-love%2C%20&keywords_type=allwords&list_id=57976&product=meld&query_format=advanced Cool, thank you. I'll have a look at those and play around with the code a little bit. The next days (or maybe weeks) will be busy for me. But you hear from me as soon as I have got questions. ;) >... > And btw, there is one feature that I really really miss in meld and >> that's to collapse equal lines in file diff. (Or did I just not find out >> how it works yet?) >> I don't know if you want such a feature or not. But if so and after >> getting to know the code a littler more I would love to work on >> implementing something like this. >> > > I'd be interested in seeing this. For me, the blocking issue for a feature > like this is always going to be: how will this be exposed to the user? > There's an old bug report asking for (I think) pretty much what you're > suggesting (https://bugzilla.gnome.org/show_bug.cgi?id=664624) so maybe > check that out in case it helps at all. > Yes, that's exactly what I had in mind. > ... > Regards, David