From edgimar@lycos.com Wed Aug 15 09:13:48 2007 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 menubar.gnome.org (Postfix) with ESMTP id 718A43B02DA for ; Wed, 15 Aug 2007 09:13:48 -0400 (EDT) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Score: 1.594 X-Spam-Level: * X-Spam-Status: No, score=1.594 tagged_above=-999 required=2 tests=[BAYES_50=0.001, FORGED_RCVD_HELO=0.135, HTML_30_40=0.374, HTML_MESSAGE=0.001, HTML_MIME_NO_HTML_TAG=1.082, MIME_HTML_ONLY=0.001] X-Amavis-OS-Fingerprint: Linux 2.6, seldom 2.4 (older, 4) (up: 5077 hrs), (distance 20, link: ethernet/modem), [209.202.208.41] Received: from menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id srddu7W4QivO for ; Wed, 15 Aug 2007 09:13:45 -0400 (EDT) Received: from smail1.lycosmail.lycos.com (bos-mail-smail1.bos.lycos.com [209.202.208.41]) by menubar.gnome.org (Postfix) with ESMTP id 44D653B02C0 for ; Wed, 15 Aug 2007 09:13:45 -0400 (EDT) Received: from bos-mail-wwl17.lycosmail.com (bos-mail-wwl17b.bos.lycos.com [10.124.64.97]) by bos-mail-smail1.lycosmail.com (8.13.6/8.9.1) with ESMTP id l7FDDXB8031450; Wed, 15 Aug 2007 09:13:33 -0400 Received: (from hanadmin@localhost) by bos-mail-wwl17.lycosmail.com (8.12.9/8.9.1) id l7FDDVeB029101 for ; Wed, 15 Aug 2007 22:13:31 +0900 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [134.102.219.26] From: "Mark Edgington" Organization: Lycos. Inc. Priority: Normal To: Subject: spaces instead of tabs X-Mailer: Lycos Web Mailer 1.1 Date: Wed, 15 Aug 2007 09:13:30 -0400 (EDT) Message-Id: <20070815091330.HM.0000000000000XG@edgimar.bos-mail-wwl17.lycos.com> Errors-To: MIME-Version: 1.0 X-HM-TU: VHi89hns2UdPndEjnwcorhRSlecn6ymh2WN1zu/4+AE= X-Hanmail-Attr: fc=1 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.8 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, 15 Aug 2007 13:13:48 -0000 I have a small feature request-- it would be handy if there were a checkbox in Preferences->Editor->Misc named "Use spaces instead of tabs". This would insert spaces when the tab key was pressed instead of a tab character. This is useful when working in a language like python, where the source code uses spaces instead of tabs.

What do you think? Would this be difficult / bad to implement?


Looking for the Hottest New Ringtones?
Find them at Lycos Mobile. Get 10 Bonus Tones today!
From matthijs.van.de.water@gmail.com Tue Aug 14 10:03:19 2007 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 menubar.gnome.org (Postfix) with ESMTP id F2BA63B00C1 for ; Tue, 14 Aug 2007 10:03:18 -0400 (EDT) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Score: -2.6 X-Spam-Level: X-Spam-Status: No, score=-2.6 tagged_above=-999 required=2 tests=[BAYES_00=-2.599, SPF_PASS=-0.001] X-Amavis-OS-Fingerprint: Linux 2.6 (newer, 2) (firewall!) (up: 3979 hrs), (distance 13, link: (Google 2)), [209.85.198.189] Received: from menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oyXa-tRRGVQ5 for ; Tue, 14 Aug 2007 10:03:13 -0400 (EDT) Received: from rv-out-0910.google.com (rv-out-0910.google.com [209.85.198.189]) by menubar.gnome.org (Postfix) with ESMTP id F2D773B013C for ; Tue, 14 Aug 2007 10:03:12 -0400 (EDT) Received: by rv-out-0910.google.com with SMTP id k20so1492596rvb for ; Tue, 14 Aug 2007 07:03:11 -0700 (PDT) Received: by 10.140.199.19 with SMTP id w19mr3039616rvf.1187100191377; Tue, 14 Aug 2007 07:03:11 -0700 (PDT) Received: by 10.141.87.10 with HTTP; Tue, 14 Aug 2007 07:03:11 -0700 (PDT) Message-ID: <35a670560708140703p268fd63fo616c35f7c07e6c80@mail.gmail.com> Date: Tue, 14 Aug 2007 16:03:11 +0200 From: "Matthijs van de Water" To: meld-list@gnome.org Subject: [PATCH] resolve SVN conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Mailman-Approved-At: Wed, 15 Aug 2007 14:10:01 -0400 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.8 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, 14 Aug 2007 14:03:19 -0000 Hi, I've been using Meld to resolve SVN conflicts for some time now and was annoyed by the fact it didn't have a menu-option to mark a conflicted file as resolved. I've made a patch which works for me (probably breaks on CVS, not sure) which can serve as a basis for supporting this feature in a future version. See Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=403193 I'm not subscribed to this list, so please 'reply-to-all'. Regards, -- Matthijs van de Water | iRex Technologies B.V. Embedded Software Engineer | www.irextechnologies.com From suasol@gmail.com Wed Aug 15 16:31:16 2007 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 menubar.gnome.org (Postfix) with ESMTP id 477973B01D4 for ; Wed, 15 Aug 2007 16:31:16 -0400 (EDT) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Score: -2.446 X-Spam-Level: X-Spam-Status: No, score=-2.446 tagged_above=-999 required=2 tests=[AWL=0.077, BAYES_00=-2.599, SPF_PASS=-0.001, TW_VC=0.077] X-Amavis-OS-Fingerprint: Linux 2.6 (newer, 2) (firewall!) (up: 11726 hrs), (distance 14, link: (Google 2)), [66.249.82.232] Received: from menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JKxV2QPgnypu for ; Wed, 15 Aug 2007 16:31:14 -0400 (EDT) Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.232]) by menubar.gnome.org (Postfix) with ESMTP id 473563B023E for ; Wed, 15 Aug 2007 16:31:13 -0400 (EDT) Received: by wx-out-0506.google.com with SMTP id h26so29593wxd for ; Wed, 15 Aug 2007 13:31:12 -0700 (PDT) Received: by 10.70.87.9 with SMTP id k9mr1512819wxb.1187209866207; Wed, 15 Aug 2007 13:31:06 -0700 (PDT) Received: by 10.70.25.18 with HTTP; Wed, 15 Aug 2007 13:31:06 -0700 (PDT) Message-ID: Date: Wed, 15 Aug 2007 21:31:06 +0100 From: "Stephen Kennedy" Sender: suasol@gmail.com To: "Matthijs van de Water" Subject: Re: [PATCH] resolve SVN conflicts In-Reply-To: <35a670560708140703p268fd63fo616c35f7c07e6c80@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <35a670560708140703p268fd63fo616c35f7c07e6c80@mail.gmail.com> X-Google-Sender-Auth: de0e12ddac3c4d1e Cc: meld-list@gnome.org X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.8 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, 15 Aug 2007 20:31:16 -0000 Thanks Matthijs, thanks for your work. I had a look at your patch and have commented on bugzilla too. I'm a little wary of introducing UI which only works for one vc system. I've added stubs to the VC base object so that vcview can enquire which methods are optionally supported. (VC.get_capabilities()). Can you change the patch so that vcview only shows the resolve UI when it is supported? Thanks, Stephen. On 8/14/07, Matthijs van de Water wrote: > Hi, > > I've been using Meld to resolve SVN conflicts for some time now and > was annoyed by the fact it didn't have a menu-option to mark a > conflicted file as resolved. > > I've made a patch which works for me (probably breaks on CVS, not > sure) which can serve as a basis for supporting this feature in a > future version. > > See Bugzilla: > http://bugzilla.gnome.org/show_bug.cgi?id=403193 > > I'm not subscribed to this list, so please 'reply-to-all'. > > Regards, > -- > Matthijs van de Water | iRex Technologies B.V. > Embedded Software Engineer | www.irextechnologies.com > _______________________________________________ > meld-list mailing list > meld-list@gnome.org > http://mail.gnome.org/mailman/listinfo/meld-list > From gcgm-meld-list@m.gmane.org Fri Aug 17 08:57:26 2007 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 menubar.gnome.org (Postfix) with ESMTP id 8661B3B00AC for ; Fri, 17 Aug 2007 08:57:26 -0400 (EDT) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Score: -1.101 X-Spam-Level: X-Spam-Status: No, score=-1.101 tagged_above=-999 required=2 tests=[BAYES_00=-2.599, RCVD_NUMERIC_HELO=1.5, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001] X-Amavis-OS-Fingerprint: Linux 2.6, seldom 2.4 (older, 4) (up: 6653 hrs), (distance 19, link: ethernet/modem), [80.91.229.2] Received: from menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YFZnCoCaDeah for ; Fri, 17 Aug 2007 08:57:24 -0400 (EDT) Received: from ciao.gmane.org (main.gmane.org [80.91.229.2]) by menubar.gnome.org (Postfix) with ESMTP id 911A83B0098 for ; Fri, 17 Aug 2007 08:57:20 -0400 (EDT) Received: from root by ciao.gmane.org with local (Exim 4.43) id 1IM1Ly-0003jd-3o for meld-list@gnome.org; Fri, 17 Aug 2007 14:55:02 +0200 Received: from 57.66.65.38 ([57.66.65.38]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 17 Aug 2007 14:55:02 +0200 Received: from mw_phil by 57.66.65.38 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 17 Aug 2007 14:55:02 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: meld-list@gnome.org From: MikeW Subject: Selecting/Deleting blocks across both files Date: Fri, 17 Aug 2007 12:43:35 +0000 (UTC) Lines: 23 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: main.gmane.org User-Agent: Loom/3.14 (http://gmane.org/) X-Loom-IP: 57.66.65.38 (Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.10) Gecko/20070221 Red Hat/1.5.0.10-0.1.el4 Firefox/1.5.0.10) Sender: news X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.8 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, 17 Aug 2007 12:57:26 -0000 I was trying to refactor/reduce two sets of patches (separate patchfiles) and was using Meld to check for differences and commonality, and then eliminate all file patches that occurred in both files. However, when I wanted to remove a patch operation common to both files, there was no way of selecting a block of text across both files simultaneously in order to delete. I tried doing it piecemeal, one side at a time, but then the text sync got confused and there doesn't appear to be a way of pinning the file sync across files. Any ideas please about how I should go about this ? Incidentally, neither could I find a way of merging to a new third file, which might have been an alternative, since both input files were just shown as complete deletions from the destination file !! I had been hoping for a) diffs between 2 inputs shown as usual, with b) option to copy blocks from either into destination file. (Maybe I could use a copy of one of the inputs as my initial output.) Regards, MikeW From bog@math.bme.hu Thu Aug 30 06:00:04 2007 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 menubar.gnome.org (Postfix) with ESMTP id 556483B00DB for ; Thu, 30 Aug 2007 06:00:04 -0400 (EDT) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Score: -0.185 X-Spam-Level: X-Spam-Status: No, score=-0.185 tagged_above=-999 required=2 tests=[BAYES_40=-0.185] X-Amavis-OS-Fingerprint: Linux 2.6 (newer, 3) (up: 550 hrs), (distance 23, link: ethernet/modem), [152.66.83.1] Received: from menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3Lp491YEYWJq for ; Thu, 30 Aug 2007 05:59:59 -0400 (EDT) Received: from proof.math.bme.hu (proof.math.bme.hu [152.66.83.1]) by menubar.gnome.org (Postfix) with ESMTP id 9665A3B009C for ; Thu, 30 Aug 2007 05:59:59 -0400 (EDT) Received: from localhost (fs.math.bme.hu [152.66.83.4]) by proof.math.bme.hu (Postfix) with ESMTP id C803B38C56 for ; Thu, 30 Aug 2007 11:59:56 +0200 (CEST) Received: from proof.math.bme.hu ([152.66.83.1]) by localhost (fs.math.bme.hu [152.66.83.4]) (amavisd-new, port 10024) with ESMTP id 07964-04 for ; Thu, 30 Aug 2007 11:59:53 +0200 (CEST) Received: from [152.66.83.245] (unknown [152.66.83.245]) by proof.math.bme.hu (Postfix) with ESMTP id 01C4A38C4B for ; Thu, 30 Aug 2007 11:59:53 +0200 (CEST) Subject: copy preserve timestamps From: =?ISO-8859-1?Q?Bogl=E1rka_T=F3th?= To: meld-list@gnome.org Content-Type: text/plain Date: Thu, 30 Aug 2007 12:05:47 +0200 Message-Id: <1188468347.14298.41.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.10.1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at math.bme.hu X-Mailman-Approved-At: Wed, 05 Sep 2007 15:37:56 -0400 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.8 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, 30 Aug 2007 10:00:04 -0000 Hi! I would like to suggest a modification in the program. For the moment when you copy files from one directory to an other the new file always have the actual date and time. However usually it is preferable to preserve the timestamps of the original file. With the cp command it can be done by the -p or -a options. so I hope it would be a big change! Have a nice day, Bogi From edgimar@lycos.com Wed Aug 15 09:13:48 2007 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 menubar.gnome.org (Postfix) with ESMTP id 718A43B02DA for ; Wed, 15 Aug 2007 09:13:48 -0400 (EDT) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Score: 1.594 X-Spam-Level: * X-Spam-Status: No, score=1.594 tagged_above=-999 required=2 tests=[BAYES_50=0.001, FORGED_RCVD_HELO=0.135, HTML_30_40=0.374, HTML_MESSAGE=0.001, HTML_MIME_NO_HTML_TAG=1.082, MIME_HTML_ONLY=0.001] X-Amavis-OS-Fingerprint: Linux 2.6, seldom 2.4 (older, 4) (up: 5077 hrs), (distance 20, link: ethernet/modem), [209.202.208.41] Received: from menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id srddu7W4QivO for ; Wed, 15 Aug 2007 09:13:45 -0400 (EDT) Received: from smail1.lycosmail.lycos.com (bos-mail-smail1.bos.lycos.com [209.202.208.41]) by menubar.gnome.org (Postfix) with ESMTP id 44D653B02C0 for ; Wed, 15 Aug 2007 09:13:45 -0400 (EDT) Received: from bos-mail-wwl17.lycosmail.com (bos-mail-wwl17b.bos.lycos.com [10.124.64.97]) by bos-mail-smail1.lycosmail.com (8.13.6/8.9.1) with ESMTP id l7FDDXB8031450; Wed, 15 Aug 2007 09:13:33 -0400 Received: (from hanadmin@localhost) by bos-mail-wwl17.lycosmail.com (8.12.9/8.9.1) id l7FDDVeB029101 for ; Wed, 15 Aug 2007 22:13:31 +0900 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [134.102.219.26] From: "Mark Edgington" Organization: Lycos. Inc. Priority: Normal To: Subject: spaces instead of tabs X-Mailer: Lycos Web Mailer 1.1 Date: Wed, 15 Aug 2007 09:13:30 -0400 (EDT) Message-Id: <20070815091330.HM.0000000000000XG@edgimar.bos-mail-wwl17.lycos.com> Errors-To: MIME-Version: 1.0 X-HM-TU: VHi89hns2UdPndEjnwcorhRSlecn6ymh2WN1zu/4+AE= X-Hanmail-Attr: fc=1 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.8 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, 15 Aug 2007 13:13:48 -0000 I have a small feature request-- it would be handy if there were a checkbox in Preferences->Editor->Misc named "Use spaces instead of tabs". This would insert spaces when the tab key was pressed instead of a tab character. This is useful when working in a language like python, where the source code uses spaces instead of tabs.

What do you think? Would this be difficult / bad to implement?


Looking for the Hottest New Ringtones?
Find them at Lycos Mobile. Get 10 Bonus Tones today!
From matthijs.van.de.water@gmail.com Tue Aug 14 10:03:19 2007 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 menubar.gnome.org (Postfix) with ESMTP id F2BA63B00C1 for ; Tue, 14 Aug 2007 10:03:18 -0400 (EDT) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Score: -2.6 X-Spam-Level: X-Spam-Status: No, score=-2.6 tagged_above=-999 required=2 tests=[BAYES_00=-2.599, SPF_PASS=-0.001] X-Amavis-OS-Fingerprint: Linux 2.6 (newer, 2) (firewall!) (up: 3979 hrs), (distance 13, link: (Google 2)), [209.85.198.189] Received: from menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oyXa-tRRGVQ5 for ; Tue, 14 Aug 2007 10:03:13 -0400 (EDT) Received: from rv-out-0910.google.com (rv-out-0910.google.com [209.85.198.189]) by menubar.gnome.org (Postfix) with ESMTP id F2D773B013C for ; Tue, 14 Aug 2007 10:03:12 -0400 (EDT) Received: by rv-out-0910.google.com with SMTP id k20so1492596rvb for ; Tue, 14 Aug 2007 07:03:11 -0700 (PDT) Received: by 10.140.199.19 with SMTP id w19mr3039616rvf.1187100191377; Tue, 14 Aug 2007 07:03:11 -0700 (PDT) Received: by 10.141.87.10 with HTTP; Tue, 14 Aug 2007 07:03:11 -0700 (PDT) Message-ID: <35a670560708140703p268fd63fo616c35f7c07e6c80@mail.gmail.com> Date: Tue, 14 Aug 2007 16:03:11 +0200 From: "Matthijs van de Water" To: meld-list@gnome.org Subject: [PATCH] resolve SVN conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Mailman-Approved-At: Wed, 15 Aug 2007 14:10:01 -0400 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.8 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, 14 Aug 2007 14:03:19 -0000 Hi, I've been using Meld to resolve SVN conflicts for some time now and was annoyed by the fact it didn't have a menu-option to mark a conflicted file as resolved. I've made a patch which works for me (probably breaks on CVS, not sure) which can serve as a basis for supporting this feature in a future version. See Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=403193 I'm not subscribed to this list, so please 'reply-to-all'. Regards, -- Matthijs van de Water | iRex Technologies B.V. Embedded Software Engineer | www.irextechnologies.com From suasol@gmail.com Wed Aug 15 16:31:16 2007 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 menubar.gnome.org (Postfix) with ESMTP id 477973B01D4 for ; Wed, 15 Aug 2007 16:31:16 -0400 (EDT) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Score: -2.446 X-Spam-Level: X-Spam-Status: No, score=-2.446 tagged_above=-999 required=2 tests=[AWL=0.077, BAYES_00=-2.599, SPF_PASS=-0.001, TW_VC=0.077] X-Amavis-OS-Fingerprint: Linux 2.6 (newer, 2) (firewall!) (up: 11726 hrs), (distance 14, link: (Google 2)), [66.249.82.232] Received: from menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JKxV2QPgnypu for ; Wed, 15 Aug 2007 16:31:14 -0400 (EDT) Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.232]) by menubar.gnome.org (Postfix) with ESMTP id 473563B023E for ; Wed, 15 Aug 2007 16:31:13 -0400 (EDT) Received: by wx-out-0506.google.com with SMTP id h26so29593wxd for ; Wed, 15 Aug 2007 13:31:12 -0700 (PDT) Received: by 10.70.87.9 with SMTP id k9mr1512819wxb.1187209866207; Wed, 15 Aug 2007 13:31:06 -0700 (PDT) Received: by 10.70.25.18 with HTTP; Wed, 15 Aug 2007 13:31:06 -0700 (PDT) Message-ID: Date: Wed, 15 Aug 2007 21:31:06 +0100 From: "Stephen Kennedy" Sender: suasol@gmail.com To: "Matthijs van de Water" Subject: Re: [PATCH] resolve SVN conflicts In-Reply-To: <35a670560708140703p268fd63fo616c35f7c07e6c80@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <35a670560708140703p268fd63fo616c35f7c07e6c80@mail.gmail.com> X-Google-Sender-Auth: de0e12ddac3c4d1e Cc: meld-list@gnome.org X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.8 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, 15 Aug 2007 20:31:16 -0000 Thanks Matthijs, thanks for your work. I had a look at your patch and have commented on bugzilla too. I'm a little wary of introducing UI which only works for one vc system. I've added stubs to the VC base object so that vcview can enquire which methods are optionally supported. (VC.get_capabilities()). Can you change the patch so that vcview only shows the resolve UI when it is supported? Thanks, Stephen. On 8/14/07, Matthijs van de Water wrote: > Hi, > > I've been using Meld to resolve SVN conflicts for some time now and > was annoyed by the fact it didn't have a menu-option to mark a > conflicted file as resolved. > > I've made a patch which works for me (probably breaks on CVS, not > sure) which can serve as a basis for supporting this feature in a > future version. > > See Bugzilla: > http://bugzilla.gnome.org/show_bug.cgi?id=403193 > > I'm not subscribed to this list, so please 'reply-to-all'. > > Regards, > -- > Matthijs van de Water | iRex Technologies B.V. > Embedded Software Engineer | www.irextechnologies.com > _______________________________________________ > meld-list mailing list > meld-list@gnome.org > http://mail.gnome.org/mailman/listinfo/meld-list > From gcgm-meld-list@m.gmane.org Fri Aug 17 08:57:26 2007 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 menubar.gnome.org (Postfix) with ESMTP id 8661B3B00AC for ; Fri, 17 Aug 2007 08:57:26 -0400 (EDT) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Score: -1.101 X-Spam-Level: X-Spam-Status: No, score=-1.101 tagged_above=-999 required=2 tests=[BAYES_00=-2.599, RCVD_NUMERIC_HELO=1.5, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001] X-Amavis-OS-Fingerprint: Linux 2.6, seldom 2.4 (older, 4) (up: 6653 hrs), (distance 19, link: ethernet/modem), [80.91.229.2] Received: from menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YFZnCoCaDeah for ; Fri, 17 Aug 2007 08:57:24 -0400 (EDT) Received: from ciao.gmane.org (main.gmane.org [80.91.229.2]) by menubar.gnome.org (Postfix) with ESMTP id 911A83B0098 for ; Fri, 17 Aug 2007 08:57:20 -0400 (EDT) Received: from root by ciao.gmane.org with local (Exim 4.43) id 1IM1Ly-0003jd-3o for meld-list@gnome.org; Fri, 17 Aug 2007 14:55:02 +0200 Received: from 57.66.65.38 ([57.66.65.38]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 17 Aug 2007 14:55:02 +0200 Received: from mw_phil by 57.66.65.38 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 17 Aug 2007 14:55:02 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: meld-list@gnome.org From: MikeW Subject: Selecting/Deleting blocks across both files Date: Fri, 17 Aug 2007 12:43:35 +0000 (UTC) Lines: 23 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: main.gmane.org User-Agent: Loom/3.14 (http://gmane.org/) X-Loom-IP: 57.66.65.38 (Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.10) Gecko/20070221 Red Hat/1.5.0.10-0.1.el4 Firefox/1.5.0.10) Sender: news X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.8 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, 17 Aug 2007 12:57:26 -0000 I was trying to refactor/reduce two sets of patches (separate patchfiles) and was using Meld to check for differences and commonality, and then eliminate all file patches that occurred in both files. However, when I wanted to remove a patch operation common to both files, there was no way of selecting a block of text across both files simultaneously in order to delete. I tried doing it piecemeal, one side at a time, but then the text sync got confused and there doesn't appear to be a way of pinning the file sync across files. Any ideas please about how I should go about this ? Incidentally, neither could I find a way of merging to a new third file, which might have been an alternative, since both input files were just shown as complete deletions from the destination file !! I had been hoping for a) diffs between 2 inputs shown as usual, with b) option to copy blocks from either into destination file. (Maybe I could use a copy of one of the inputs as my initial output.) Regards, MikeW From bog@math.bme.hu Thu Aug 30 06:00:04 2007 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 menubar.gnome.org (Postfix) with ESMTP id 556483B00DB for ; Thu, 30 Aug 2007 06:00:04 -0400 (EDT) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Score: -0.185 X-Spam-Level: X-Spam-Status: No, score=-0.185 tagged_above=-999 required=2 tests=[BAYES_40=-0.185] X-Amavis-OS-Fingerprint: Linux 2.6 (newer, 3) (up: 550 hrs), (distance 23, link: ethernet/modem), [152.66.83.1] Received: from menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3Lp491YEYWJq for ; Thu, 30 Aug 2007 05:59:59 -0400 (EDT) Received: from proof.math.bme.hu (proof.math.bme.hu [152.66.83.1]) by menubar.gnome.org (Postfix) with ESMTP id 9665A3B009C for ; Thu, 30 Aug 2007 05:59:59 -0400 (EDT) Received: from localhost (fs.math.bme.hu [152.66.83.4]) by proof.math.bme.hu (Postfix) with ESMTP id C803B38C56 for ; Thu, 30 Aug 2007 11:59:56 +0200 (CEST) Received: from proof.math.bme.hu ([152.66.83.1]) by localhost (fs.math.bme.hu [152.66.83.4]) (amavisd-new, port 10024) with ESMTP id 07964-04 for ; Thu, 30 Aug 2007 11:59:53 +0200 (CEST) Received: from [152.66.83.245] (unknown [152.66.83.245]) by proof.math.bme.hu (Postfix) with ESMTP id 01C4A38C4B for ; Thu, 30 Aug 2007 11:59:53 +0200 (CEST) Subject: copy preserve timestamps From: =?ISO-8859-1?Q?Bogl=E1rka_T=F3th?= To: meld-list@gnome.org Content-Type: text/plain Date: Thu, 30 Aug 2007 12:05:47 +0200 Message-Id: <1188468347.14298.41.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.10.1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at math.bme.hu X-Mailman-Approved-At: Wed, 05 Sep 2007 15:37:56 -0400 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.8 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, 30 Aug 2007 10:00:04 -0000 Hi! I would like to suggest a modification in the program. For the moment when you copy files from one directory to an other the new file always have the actual date and time. However usually it is preferable to preserve the timestamps of the original file. With the cp command it can be done by the -p or -a options. so I hope it would be a big change! Have a nice day, Bogi