Thanks,

Ted Yin

--
--- This= information is automatically generated ---
Welcome to My Blog : http://www.tedyin.com/bl= og/

ted.sybil aka. ymfoi aka.=C2=A0Ted Yin

--e89a8f2344751c86c804c6e1a162-- From kai.willadsen@gmail.com Fri Aug 10 21:57:12 2012 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 69ED775025C for ; Fri, 10 Aug 2012 21:57:12 +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 menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pW5z1otzyWPo for ; Fri, 10 Aug 2012 21:56:55 +0000 (UTC) Received: from mail-ey0-f182.google.com (mail-ey0-f182.google.com [209.85.215.182]) by menubar.gnome.org (Postfix) with ESMTP id E461D750255 for ; Fri, 10 Aug 2012 21:56:54 +0000 (UTC) Received: by eaak11 with SMTP id k11so704138eaa.27 for ; Fri, 10 Aug 2012 14:56:56 -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=zjO2WfzukpvgAWS85YUrjdvoPjGpU0S+4aacysEu6iY=; b=C6DR9eSpMH7am1ZXYmhMuNnXWWdBxnuX3Q0Z3xIDTfkPknWYHL2sN8kOIvF/IMPDoc Iz/XCxWsjbS617B7MMC+K2vXoaBjAd7a5F36Q0380jZZyX15tS+SUfBffeDp8SW0XzTx KFdHwq9zG7IiybgU2JeSqgPPC42xZ7FpUDcY8T8OAG4i1UhWPfPsdPFh/b3bYM2O8+k2 Z7o1SSOJIMkmwLb4yLR2w4LX0+UPTHGS25a8uohOE+dpgFNXameOijPrbtaTAZlqDs6r YkQmMUAhqpY4/UKwwu+HvGkhUnhYOA2btfVSBgQFT6hxo9/6VsX0zuEW0jSePjb1fr3J N6Fw== MIME-Version: 1.0 Received: by 10.14.209.129 with SMTP id s1mr5044506eeo.24.1344635816411; Fri, 10 Aug 2012 14:56:56 -0700 (PDT) Received: by 10.14.219.4 with HTTP; Fri, 10 Aug 2012 14:56:56 -0700 (PDT) In-Reply-To: References: Date: Sat, 11 Aug 2012 07:56:56 +1000 Message-ID: Subject: Re: Interested in this project, API documentation request. From: Kai Willadsen To: Ted Yin Content-Type: text/plain; charset=UTF-8 Cc: meld-list@gnome.org X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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, 10 Aug 2012 21:57:12 -0000 On 10 August 2012 14:17, Ted Yin wrote: > Hi, developers, > > You've done an excellent job! > I'm write a project which need file visual comparison as a widget-level > part. > So is there any guide or documentation for me to reuse your perfect work? > I just need a widget for comparison. Can you help me? I'm sorry, but there really isn't any API documentation, and there's no single widget you can pull out. Pretty much everything you need is in filediff.py, linkmap.py and diffutil.py (and matchers.py, though you could also Python's difflib instead). In particular, the change drawing happens in FileDiff.on_textview_expose_event, and the inline highlighting in FileDiff._update_highlighting. You'll need to have a widget setup like the one that Meld uses though, with textviews, linkmaps, etc. arranged appropriately. If you just want a visual comparison, much of what Meld does is overkill; much of the code is involved in supporting on-the-fly updating and other editing features. You might be able to remove editing functionality from FileDiff piece-by-piece to get down to a simple comparison component. cheers, Kai From beyerg@bellsouth.net Tue Aug 14 20:08:48 2012 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 91C81750507 for ; Tue, 14 Aug 2012 20:08:48 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.998 X-Spam-Level: X-Spam-Status: No, score=-1.998 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_NONE=-0.0001] autolearn=ham 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 R4guR-1LEF4L for ; Tue, 14 Aug 2012 20:08:47 +0000 (UTC) Received: from nm23-vm0.access.bullet.mail.mud.yahoo.com (nm23-vm0.access.bullet.mail.mud.yahoo.com [66.94.236.141]) by menubar.gnome.org (Postfix) with ESMTP id BD8837504B9 for ; Tue, 14 Aug 2012 20:08:46 +0000 (UTC) Received: from [66.94.237.195] by nm23.access.bullet.mail.mud.yahoo.com with NNFMP; 14 Aug 2012 20:08:52 -0000 Received: from [98.139.244.49] by tm6.access.bullet.mail.mud.yahoo.com with NNFMP; 14 Aug 2012 20:08:52 -0000 Received: from [127.0.0.1] by smtp111.sbc.mail.bf1.yahoo.com with NNFMP; 14 Aug 2012 20:08:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bellsouth.net; s=s1024; t=1344974931; bh=/MF7jMAMcMHC669r0QcfFg1Ss9VEuT0RG1RGSSalrqQ=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type; b=6AV1hbbg7lcHgXXKzawyc3WY/vkffiVO4NPfku2w6Z3V1gYmeHvw6LzYM7dZG19iByhG+IizrIdbK6gomQvk1AlJmzo/r3reHqU9IqDmtg5jOKkEckctYhafLKKWHXzxN14+j+AV3uULin/WhbUFWm2AbCcLxXVh76DOf3meRkM= X-Yahoo-Newman-Id: 954953.90808.bm@smtp111.sbc.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: DfA7EFwVM1lBnnX3HhFseXAQSbeSWUqSuKWBM8fzi3CYV1G dX5.DiMpn5ybxNnS7brFLRAoCfDQ4NP8ik_4fTYSw.zn04WiM9W39XJocrXl x9mpqDpNc4yNrEwjfoRtYiD8SxclRV5Wwip6Y6.hnmFF64neuUZwKwNcVesZ SaiBnnjlJOIsqAEJw_QPESrWqCZ6lcvxh4JTfeI7do7yftDJkGOWJPJetdPd HUJyACtoMHER94XqqtU8B2f0ZybCUzM2yfK_qBCCrKSIBL8fk7TrUOfhkNsC rn.VWg59pMrHc9Fozp9VYa68_mwbrEMWLwbbMlCPHoqbGD5bFWKAHifUtgX6 cDzrMXCVszCRYybD72FAB_sjGbA4dB1Oynz1S5TwJUjbQ1V90veemCUx62wZ czqI4hVYB9cd198m3O40I99H.wAi0YTIjA_gh1V2A_TRDtVg_wrm1DQ-- X-Yahoo-SMTP: 4jHC45KswBD25Hw6lbjBcK_gYo7Pi6KRTU88e79ehnDC Received: from [10.0.0.3] (beyerg@99.26.113.3 with plain) by smtp111.sbc.mail.bf1.yahoo.com with SMTP; 14 Aug 2012 13:08:51 -0700 PDT Message-ID: <502AB055.3050108@bellsouth.net> Date: Tue, 14 Aug 2012 16:08:53 -0400 From: Gregory Beyer User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: meld-list@gnome.org Subject: Newbie question - Bold Red files are identical Content-Type: multipart/alternative; boundary="------------030004050909060401060407" X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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 2012 20:08:48 -0000 This is a multi-part message in MIME format. --------------030004050909060401060407 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, I'm a brand new user, trying to figure out how to use it. It /seems/ intuitive, but I'm confused. I need to compare hundreds of files in dozens of directories. I have the "pristine" copy of dir structure & files in the left pane. In the right I have the dir structure which contains files which are to some degree different from the pristine copy. I have the "New" and "Modified" buttons upper right depressed. When I compare the two I have many files in bold red. That, I believe means that the files are different, right? When I R-click a file and "Compare" the files open left and right pane, and a lightbulb with "Files are identical" shows on both files. Why are files which are identical flagged in red bold? And I *finally* found two files, bold red, which when I compare, yes, the two are different and I can see the difference in the code. So that diffeernce report is accurate. How do I see ONLY the files which are different? Thanks much, Greg Beyer --------------030004050909060401060407 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi,

I'm a brand new user, trying to figure out how to use it. It seems intuitive, but I'm confused.

I need to compare hundreds of files in dozens of directories.

I have the "pristine" copy of dir structure & files in the left pane. In the right I have the dir structure which contains files which are to some degree different from the pristine copy.

I have the "New" and "Modified" buttons upper right depressed.

When I compare the two I have many files in bold red. That, I believe means that the files are different, right? When I R-click a file and "Compare" the files open left and right pane, and a lightbulb with "Files are identical" shows on both files.

Why are files which are identical flagged in red bold?

And I *finally* found two files, bold red, which when I compare, yes, the two are different and I can see the difference in the code. So that diffeernce report is accurate.

How do I see ONLY the files which are different?

Thanks much,

Greg Beyer
--------------030004050909060401060407-- From kai.willadsen@gmail.com Wed Aug 15 02:29:30 2012 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 0C5137501CF for ; Wed, 15 Aug 2012 02:29:30 +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 menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I7dJSrW+vI64 for ; Wed, 15 Aug 2012 02:29:28 +0000 (UTC) Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by menubar.gnome.org (Postfix) with ESMTP id 9AC06750104 for ; Wed, 15 Aug 2012 02:29:27 +0000 (UTC) Received: by eeke52 with SMTP id e52so431012eek.27 for ; Tue, 14 Aug 2012 19:29:32 -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=Te4L4uIlSJ9hia2wJsC//QsFXYECHjisU3P2u2gqXTY=; b=wNGr06cdvIxeCCqVk0eaFkcqjzc4PUa4oAW82U3Ht4+j6MevzJI7KWIOxLD1lw1k2T o2A4TAH7btwdNLLKerhgXJLScvvYvyUsGsWxCJemYZSWvj3pbLDawo/tye8v1iGfNmCr B8kZqNP/MTy23co/vQUH2l/IwI1slX9h7U3Dumd7nBHod9c96UYc3Q4QufMnbyp22ejz t9EJVxP71NoCNchvH3451xiEIlUeyM6d+4PCAL8Ga69/YbouuHeuzDrptNVvJVCA5aPV hxbEG9EVq5Zhegvqw2PC6IOSJdu5pVomJxKC9Euocfn+c/PIzFU2/exULVbpbR/Jyqvz Cabg== MIME-Version: 1.0 Received: by 10.14.218.134 with SMTP id k6mr18247716eep.14.1344997772773; Tue, 14 Aug 2012 19:29:32 -0700 (PDT) Received: by 10.14.209.201 with HTTP; Tue, 14 Aug 2012 19:29:32 -0700 (PDT) In-Reply-To: <502AB055.3050108@bellsouth.net> References: <502AB055.3050108@bellsouth.net> Date: Wed, 15 Aug 2012 12:29:32 +1000 Message-ID: Subject: Re: Newbie question - Bold Red files are identical From: Kai Willadsen To: Gregory Beyer Content-Type: text/plain; charset=UTF-8 Cc: meld-list@gnome.org X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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 2012 02:29:30 -0000 On 15 August 2012 06:08, Gregory Beyer wrote: > Hi, > > I'm a brand new user, trying to figure out how to use it. It seems > intuitive, but I'm confused. > > I need to compare hundreds of files in dozens of directories. > > I have the "pristine" copy of dir structure & files in the left pane. In > the right I have the dir structure which contains files which are to some > degree different from the pristine copy. > > I have the "New" and "Modified" buttons upper right depressed. > > When I compare the two I have many files in bold red. That, I believe > means that the files are different, right? When I R-click a file and > "Compare" the files open left and right pane, and a lightbulb with > "Files are identical" shows on both files. > > Why are files which are identical flagged in red bold? > > And I *finally* found two files, bold red, which when I compare, yes, the > two are different and I can see the difference in the code. So that > diffeernce report is accurate. > > How do I see ONLY the files which are different? This almost always happens because the files have different line endings (e.g., \r vs \r\n). The directory comparison works byte-by-byte, whereas the file comparison splits on lines. As a result, if you have end-of-line differences between the files, directory comparison will show those as being different. For a bit of discussion, see: https://bugzilla.gnome.org/show_bug.cgi?id=547743 If it turns out that your files have identical line endings, then please let us know, as it's probably a new bug. cheers, Kai From beyerg@bellsouth.net Wed Aug 15 13:06:20 2012 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 CD3CF7502DB for ; Wed, 15 Aug 2012 13:06:19 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 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_NONE=-0.0001] autolearn=ham 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 OSV8XHEB34gW for ; Wed, 15 Aug 2012 13:06:05 +0000 (UTC) Received: from nm4.access.bullet.mail.sp2.yahoo.com (nm4.access.bullet.mail.sp2.yahoo.com [98.139.44.131]) by menubar.gnome.org (Postfix) with SMTP id B14CF750247 for ; Wed, 15 Aug 2012 13:06:05 +0000 (UTC) Received: from [98.139.44.99] by nm4.access.bullet.mail.sp2.yahoo.com with NNFMP; 15 Aug 2012 13:06:12 -0000 Received: from [98.139.44.79] by tm4.access.bullet.mail.sp2.yahoo.com with NNFMP; 15 Aug 2012 13:06:12 -0000 Received: from [127.0.0.1] by omp1016.access.mail.sp2.yahoo.com with NNFMP; 15 Aug 2012 13:06:12 -0000 X-Yahoo-Newman-Id: 35608.24566.bm@omp1016.access.mail.sp2.yahoo.com Received: (qmail 95205 invoked from network); 15 Aug 2012 13:06:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bellsouth.net; s=s1024; t=1345035971; bh=/2H8ySIbAnk3TG3FjW5YS4vQWMjzyTmxN6/ouaR+82o=; h=X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=oBKJYsyN+I2Rod358O+/9ERrec5LXehDBoVUBIJntJ2YvdBVzgbdUOvUBdDOWhACQJOVXvZ0davAVhaITMfpc1NPs0qNK0VRQUuPY5x4T5eXFWlUtTtwAN0xv0C1rQzow6sQxKmb40moWS2ixLXx3+sp8sQNfK38ImJ/Vwzffhw= X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: PfZAU5EVM1lefyOIA5ya78zXcWpFzEONAjbum6dSDjL3mL2 NkiwwKuB2xwUeO7Q99KU6W1m5wZ..oUCbt4lc7iDYJHaVcNjvgBsnOyX464A z95Gaqud_Sdat.7QkQ2h8h36XzPL665oiOxSjDWtgAbsY4evRXCjFabq0HQq hB_mwD4Ba8tv9MiBcbHze6GbK21PBu_lqtyHcvGQsJkF7Mu.cFvg5VUXRSzd xezVJ10KUoGjxmM.k6zydmN1Y33px3arc6iEPRAeLhRY3kdlrl9D63oZCtBU GH_Jid4UqtHhFCiteq1_I5ZBHQ77TWPTyfgJuGJjkYeGOyqF5JA_f0jtxlFP 23Dr234iszeLu0tzHAkr7zDkXdxJ8TMNKMY_AiK2rsdT33lIqIECfgxxzDaO a6StTO7TZuUuAnDFCYys. X-Yahoo-SMTP: 4jHC45KswBD25Hw6lbjBcK_gYo7Pi6KRTU88e79ehnDC Received: from [10.0.0.3] (beyerg@99.26.113.3 with plain) by smtp101.sbc.mail.ne1.yahoo.com with SMTP; 15 Aug 2012 06:06:11 -0700 PDT Message-ID: <502B9EC5.3000207@bellsouth.net> Date: Wed, 15 Aug 2012 09:06:13 -0400 From: Gregory Beyer User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: Kai Willadsen Subject: Re: Newbie question - Bold Red files are identical References: <502AB055.3050108@bellsouth.net> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: meld-list@gnome.org X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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 2012 13:06:20 -0000 Thanks for the quick reply Kai. I think I understand the problem having read the bug report. So Meld cannot differentiate between different line endings, and neither can dirdiff as its filters would break the comparisons. What about skinning it this way: I change the line endings on the modified structure to all be the same as the pristine structure? Then only substantive (non-line ending) differences between the files would be flagged. Assuming that approach could work, can you suggest how I could mass-change line endings across the modified files? Greg -------- Original Message -------- Subject: Re: Newbie question - Bold Red files are identical From: Kai Willadsen To: Gregory Beyer CC: meld-list@gnome.org Date: 08/14/2012 10:29 PM > On 15 August 2012 06:08, Gregory Beyer wrote: >> Hi, >> >> I'm a brand new user, trying to figure out how to use it. It seems >> intuitive, but I'm confused. >> >> I need to compare hundreds of files in dozens of directories. >> >> I have the "pristine" copy of dir structure & files in the left pane. In >> the right I have the dir structure which contains files which are to some >> degree different from the pristine copy. >> >> I have the "New" and "Modified" buttons upper right depressed. >> >> When I compare the two I have many files in bold red. That, I believe >> means that the files are different, right? When I R-click a file and >> "Compare" the files open left and right pane, and a lightbulb with >> "Files are identical" shows on both files. >> >> Why are files which are identical flagged in red bold? >> >> And I *finally* found two files, bold red, which when I compare, yes, the >> two are different and I can see the difference in the code. So that >> diffeernce report is accurate. >> >> How do I see ONLY the files which are different? > > This almost always happens because the files have different line > endings (e.g., \r vs \r\n). The directory comparison works > byte-by-byte, whereas the file comparison splits on lines. As a > result, if you have end-of-line differences between the files, > directory comparison will show those as being different. > > For a bit of discussion, see: https://bugzilla.gnome.org/show_bug.cgi?id=547743 > > If it turns out that your files have identical line endings, then > please let us know, as it's probably a new bug. > > cheers, > Kai > From beyerg@bellsouth.net Wed Aug 15 13:28:48 2012 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 31C857502D3 for ; Wed, 15 Aug 2012 13:28:48 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 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_NONE=-0.0001] autolearn=ham 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 v+QbzmC6P3py for ; Wed, 15 Aug 2012 13:28:34 +0000 (UTC) Received: from nm24.access.bullet.mail.sp2.yahoo.com (nm24.access.bullet.mail.sp2.yahoo.com [98.139.44.151]) by menubar.gnome.org (Postfix) with SMTP id 7A52375024B for ; Wed, 15 Aug 2012 13:28:33 +0000 (UTC) Received: from [98.139.44.100] by nm24.access.bullet.mail.sp2.yahoo.com with NNFMP; 15 Aug 2012 13:28:40 -0000 Received: from [98.139.44.75] by tm5.access.bullet.mail.sp2.yahoo.com with NNFMP; 15 Aug 2012 13:28:40 -0000 Received: from [127.0.0.1] by omp1012.access.mail.sp2.yahoo.com with NNFMP; 15 Aug 2012 13:28:40 -0000 X-Yahoo-Newman-Id: 698660.10937.bm@omp1012.access.mail.sp2.yahoo.com Received: (qmail 19445 invoked from network); 15 Aug 2012 13:28:40 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bellsouth.net; s=s1024; t=1345037320; bh=vB5aM7HXVvmLoVdO/o8YRz7rVGrEaTRgvaOtV8e80Cg=; h=X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=F574hNYAuy3pv7QDh+ef0r1194VwO/Fl5oYj6bVhNsFrMpEip3Y6u2Zx+lTuWO3WwRiXblp+biVjrcQwvmkICwxjU2w4cSRoQktJHmnn1Siv0EvVLOal8PjgjHYh5xqXIGPGlvuAdQNquMi+UlUhWR87rR6nsO3m2fG9EhqfAc4= X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: r070zkoVM1mpwBReG2D_HCcTNAmBhQdwOEztmycgIqOM8Mn dKthRButeBOWlfn98FLsE6z3gItHGfCqNQ_NNx9LaELUJpZy9Ksm66EyJ65H rcQuLF1kc__J9rBFI.amT9uXkXREkIBpck0BrjeIvaddPvj9X2b8fTod1XjR nrf6vNnG2.DxFnU.DsdEJsR3ysqCN4cN2ZyX.hhJpe80bsxtfkB3ySktx2_6 .HU3Se183Ri2ZpIACF0YbVAT_3RoxWcnTsmfxIo7rSsI7pAp8b_EHnPAf9DU HOHBh1ZJUKEdVuAgRnOmwXwgsU1B.qb1P.Xz9UElqzMPZApcl6xN5ersXFZV gz.29GQPANp2wgveMpzZIqir_QQmgWyp2BiEFI52IL0Eq.5VMqz0AmnpTrje OkVgOkJ9y2XrADTFnGTdF X-Yahoo-SMTP: 4jHC45KswBD25Hw6lbjBcK_gYo7Pi6KRTU88e79ehnDC Received: from [10.0.0.3] (beyerg@99.26.113.3 with plain) by smtp110.sbc.mail.ne1.yahoo.com with SMTP; 15 Aug 2012 06:28:39 -0700 PDT Message-ID: <502BA40A.2090106@bellsouth.net> Date: Wed, 15 Aug 2012 09:28:42 -0400 From: Gregory Beyer User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: meld-list@gnome.org Subject: Re: Newbie question - Bold Red files are identical References: <502AB055.3050108@bellsouth.net> <502B9EC5.3000207@bellsouth.net> In-Reply-To: <502B9EC5.3000207@bellsouth.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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 2012 13:28:48 -0000 Kai, I browsed Software Manager (Mint/Ubuntu) and find two progs that claim to be able to change line ending -- dos2unix and flip. Those packages refer to "convert between UNIX (LF), DOS (CRLF)" (dos2unix) "This program converts line endings of text files between MS-DOS and **IX formats." (flip) Your comments refer to "\r vs \r\n" Are we talking about the same thing? thanks, Greg -------- Original Message -------- Subject: Re: Newbie question - Bold Red files are identical From: Gregory Beyer To: Kai Willadsen CC: meld-list@gnome.org Date: 08/15/2012 09:06 AM > Thanks for the quick reply Kai. I think I understand the problem > having read the bug report. So Meld cannot differentiate between > different line endings, and neither can dirdiff as its filters would > break the comparisons. > > What about skinning it this way: I change the line endings on the > modified structure to all be the same as the pristine structure? Then > only substantive (non-line ending) differences between the files would > be flagged. > > Assuming that approach could work, can you suggest how I could > mass-change line endings across the modified files? > > Greg > > -------- Original Message -------- > Subject: Re: Newbie question - Bold Red files are identical > From: Kai Willadsen > To: Gregory Beyer > CC: meld-list@gnome.org > Date: 08/14/2012 10:29 PM > >> On 15 August 2012 06:08, Gregory Beyer wrote: >>> Hi, >>> >>> I'm a brand new user, trying to figure out how to use it. It seems >>> intuitive, but I'm confused. >>> >>> I need to compare hundreds of files in dozens of directories. >>> >>> I have the "pristine" copy of dir structure & files in the left >>> pane. In >>> the right I have the dir structure which contains files which are to >>> some >>> degree different from the pristine copy. >>> >>> I have the "New" and "Modified" buttons upper right depressed. >>> >>> When I compare the two I have many files in bold red. That, I believe >>> means that the files are different, right? When I R-click a file and >>> "Compare" the files open left and right pane, and a lightbulb with >>> "Files are identical" shows on both files. >>> >>> Why are files which are identical flagged in red bold? >>> >>> And I *finally* found two files, bold red, which when I compare, yes, >>> the >>> two are different and I can see the difference in the code. So that >>> diffeernce report is accurate. >>> >>> How do I see ONLY the files which are different? >> >> This almost always happens because the files have different line >> endings (e.g., \r vs \r\n). The directory comparison works >> byte-by-byte, whereas the file comparison splits on lines. As a >> result, if you have end-of-line differences between the files, >> directory comparison will show those as being different. >> >> For a bit of discussion, see: >> https://bugzilla.gnome.org/show_bug.cgi?id=547743 >> >> If it turns out that your files have identical line endings, then >> please let us know, as it's probably a new bug. >> >> cheers, >> Kai >> > _______________________________________________ > meld-list mailing list > meld-list@gnome.org > https://mail.gnome.org/mailman/listinfo/meld-list > From kaiserfro@gmail.com Thu Aug 16 20:47:59 2012 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 68DA175011B for ; Thu, 16 Aug 2012 20:47:59 +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 menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d5LPx5tUK1Q0 for ; Thu, 16 Aug 2012 20:47:45 +0000 (UTC) Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by menubar.gnome.org (Postfix) with ESMTP id D40E4750091 for ; Thu, 16 Aug 2012 20:47:44 +0000 (UTC) Received: by weyx56 with SMTP id x56so3344025wey.27 for ; Thu, 16 Aug 2012 13:47:42 -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=k+qetTgJduox1HrsSzFbt5uV0rZEkXLONA/KrDavoBs=; b=bmxayqa6i60X0tcad5og9uLehwnZqMx50xlsAb22PPxPOZvvkVhd4ikMYbYpodBSpN SYqxGJuPcXuk5t4HwgZA/i5Fl4I0wefYWUmj/apJZA7pl9tzTlc/N7IHVzMl7U2sbBnS LbYB9jnG4zvNdseLmbCAAQtFF3jeTyvZol/LNqKxPSTcB5LEhO4rxiYsQUpLm/A3sXyO 3F1mpQ+ScMwt2ztjHQ6dxs8zKl2oNU8pKFbb+POXEQ00i5/pLmZIRt1dboTL5HKjuGOE 2M7qnWSmQlsCTClPsp0NDtZgJ/Gg6NGgLDbq3sosATO3/NQoDbv7WRSJ2/PoHhgOQqX6 4CxQ== MIME-Version: 1.0 Received: by 10.180.95.193 with SMTP id dm1mr8955870wib.10.1345150062794; Thu, 16 Aug 2012 13:47:42 -0700 (PDT) Received: by 10.216.134.8 with HTTP; Thu, 16 Aug 2012 13:47:42 -0700 (PDT) Date: Thu, 16 Aug 2012 13:47:42 -0700 Message-ID: Subject: [PATCH] Copying Symlinks From: Jeff Oliver To: meld-list Content-Type: multipart/mixed; boundary=f46d041825daa9981604c76827b9 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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, 16 Aug 2012 20:47:59 -0000 --f46d041825daa9981604c76827b9 Content-Type: multipart/alternative; boundary=f46d041825daa9980704c76827b7 --f46d041825daa9980704c76827b7 Content-Type: text/plain; charset=ISO-8859-1 A friend of mine was attempting to use Meld for diffing and merging directories that contained a mixture of files and links. It ends up being a bit unintuitive as to what you end up seeing when you look at a directory diff with links. 1) There is no indication that a file is really a link. 2) A link may end up being different if the dereferenced files are different. This can happen 2 ways. First the links are the same but the files they point to are different in each window or if the links are different and the files are different. If the files end up being the same, but the links are different, I think you end up seeing a little star in the icon. 3) Attempting to copy a link in either direction fails with an error dialog indicating that you cannot copy the file. I made a quick and probably dirty patch to allow my friend to use meld for links. All this patch attempts to address is last item, at least making it usable in copying links from dir to dir. There is no extensive testing of the patch, but I'd like to have someone have a look at it. Jeff --f46d041825daa9980704c76827b7 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable A friend of mine was attempting to use Meld for diffing and merging directo= ries that contained a mixture of files and links. =A0It ends up being a bit= unintuitive as to what you end up seeing when you look at a directory diff= with links.

1) There is no indication that a file is really a link.

2) A link may end up being different if the dereferenced files are di= fferent. =A0This can happen 2 ways. =A0First the links are the same but the= files they point to are different in each window or if the links are diffe= rent and the files are different. =A0If the files end up being the same, bu= t the links are different, I think you end up seeing a little star in the i= con.

3) Attempting to copy a link in either direction fails with an error d= ialog indicating that you cannot copy the file.

I = made a quick and probably dirty patch to allow my friend to use meld for li= nks. =A0All this patch attempts to address is last item, at least making it= usable in copying links from dir to dir.

There is no extensive testing of the patch, but I'd= like to have someone have a look at it.

Jeff

--f46d041825daa9980704c76827b7-- --f46d041825daa9981604c76827b9 Content-Type: application/octet-stream; name="copy_links.patch" Content-Disposition: attachment; filename="copy_links.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h5ybhknf0 ZGlmZiAtLWdpdCBhL21lbGQvZGlyZGlmZi5weSBiL21lbGQvZGlyZGlmZi5weQppbmRleCA5ZDRj NjEyLi45ODBmZjhhIDEwMDY0NAotLS0gYS9tZWxkL2RpcmRpZmYucHkKKysrIGIvbWVsZC9kaXJk aWZmLnB5CkBAIC02NjIsNyArNjYyLDEyIEBAIGNsYXNzIERpckRpZmYobWVsZGRvYy5NZWxkRG9j LCBnbm9tZWdsYWRlLkNvbXBvbmVudCk6CiAgICAgICAgICAgICAgICAgc3JjID0gbW9kZWwudmFs dWVfcGF0aChpdCwgc3JjX3BhbmUpCiAgICAgICAgICAgICAgICAgZHN0ID0gbW9kZWwudmFsdWVf cGF0aChpdCwgZHN0X3BhbmUpCiAgICAgICAgICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAg ICAgICBpZiBvcy5wYXRoLmlzZmlsZShzcmMpOgorICAgICAgICAgICAgICAgICAgICBpZiBvcy5w YXRoLmlzbGluayhzcmMpOgorICAgICAgICAgICAgICAgICAgICAgICAgaWYgb3MucGF0aC5leGlz dHMoZHN0KToKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcy51bmxpbmsoZHN0KQorICAg ICAgICAgICAgICAgICAgICAgICAgb3Muc3ltbGluayhvcy5yZWFkbGluayhzcmMpLCBkc3QpCisg ICAgICAgICAgICAgICAgICAgICAgICBzZWxmLmZpbGVfY3JlYXRlZChwYXRoLCBkc3RfcGFuZSkK KyAgICAgICAgICAgICAgICAgICAgZWxpZiBvcy5wYXRoLmlzZmlsZShzcmMpOgogICAgICAgICAg ICAgICAgICAgICAgICAgZHN0ZGlyID0gb3MucGF0aC5kaXJuYW1lKCBkc3QgKQogICAgICAgICAg ICAgICAgICAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKCBkc3RkaXIgKToKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBvcy5tYWtlZGlycyggZHN0ZGlyICkK --f46d041825daa9981604c76827b9-- From kai.willadsen@gmail.com Thu Aug 16 20:58:25 2012 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 1C71D7502ED for ; Thu, 16 Aug 2012 20:58: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 menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KhFUkkqjYDIO for ; Thu, 16 Aug 2012 20:58:10 +0000 (UTC) Received: from mail-ey0-f182.google.com (mail-ey0-f182.google.com [209.85.215.182]) by menubar.gnome.org (Postfix) with ESMTP id 442D07502F1 for ; Thu, 16 Aug 2012 20:58:09 +0000 (UTC) Received: by eaak11 with SMTP id k11so1223589eaa.27 for ; Thu, 16 Aug 2012 13:58:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=egQujSWkECAjV7uEpArwv/G7yjoLQp5FO+OEK1+y3ic=; b=M/bTdVIiYSzpNg41MeICtF+GkzGghnLRS6pJZBFmaxB78ZkcSoThKQrn9lf3AP2Ndv pHTRyklVSk5NJ9AmMpdZlhvhW1xUne/Vr/QcJdkl3pGIo2KWNd9gJka+HcrWXI3gdIVo zpv/qEJR12mHMXrDyNwyNI2VlYMnq9if9vEJa1WSF4R0+GdgfXQPhs4zJ2+eWnn9ZVV3 okxmWB4+au09TWOBzTFus8B1ILnN69QXgz3JX/8HfaAelOZ2wILqdTO2MWaz5Qnkc68g Tiu6Vq67srY5jnH2sIlOi09jjSHNUQMeLa7K9cFl6QHRHgy+jCpgisn42fGq73eeWRw/ d/pw== MIME-Version: 1.0 Received: by 10.14.215.193 with SMTP id e41mr3412884eep.44.1345150688196; Thu, 16 Aug 2012 13:58:08 -0700 (PDT) Received: by 10.14.209.201 with HTTP; Thu, 16 Aug 2012 13:58:08 -0700 (PDT) In-Reply-To: <502BA40A.2090106@bellsouth.net> References: <502AB055.3050108@bellsouth.net> <502B9EC5.3000207@bellsouth.net> <502BA40A.2090106@bellsouth.net> Date: Fri, 17 Aug 2012 06:58:08 +1000 Message-ID: Subject: Re: Newbie question - Bold Red files are identical From: Kai Willadsen To: Gregory Beyer Content-Type: text/plain; charset=UTF-8 Cc: meld-list@gnome.org X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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, 16 Aug 2012 20:58:25 -0000 On 15 August 2012 23:28, Gregory Beyer wrote: > Kai, > > I browsed Software Manager (Mint/Ubuntu) and find two progs that claim to be > able to change line ending -- dos2unix and flip. > > Those packages refer to "convert between UNIX (LF), DOS (CRLF)" (dos2unix) > > "This program converts line endings of text files between MS-DOS and **IX > formats." (flip) > > Your comments refer to "\r vs \r\n" Are we talking about the same thing? Yes. Assuming that the line endings are the problem, that should probably work, though I'd suggest doing that in a separate copy of your folder. You can also double-check first to see whether the line endings are indeed different between your two folders (see for example http://stackoverflow.com/a/73969/2963). cheers, Kai From kai.willadsen@gmail.com Thu Aug 16 21:14:17 2012 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 DE793750091 for ; Thu, 16 Aug 2012 21:14: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 menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jMm0SyrwgecI for ; Thu, 16 Aug 2012 21:14:03 +0000 (UTC) Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by menubar.gnome.org (Postfix) with ESMTP id 702BF75032B for ; Thu, 16 Aug 2012 21:14:02 +0000 (UTC) Received: by eeke52 with SMTP id e52so1224553eek.27 for ; Thu, 16 Aug 2012 14:14: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; bh=KTQozT4C0bEOaMGqU60K42vqy7CxuqwsricHW6JLe6M=; b=hhFDhKKhMdrEHNCPgQXlegSVjYYm8eV2u4pti01Eh37sIKkXoaiDYzJRqVC0OR5I/C XJHKlJ2/LmeZ8mGkN+mkrFfWuLLE8AtazVI8im8aQsw7lOSmTAqSf8kw46+4p5FuVMjl zyXRBMpQ9sPBAK+XhrqOoPgO3fot6TSSdlF6nVrKI8Gmcwxzyqztlwr/wTUBF/pn4S0q 1MtEhv0wG3H5nyGzPsNBFG9L8jZ56VSHuSIGvvJ5mVoism5AuxwRPxK/z11IZfaWofML sNPT5wbgvJj0TQLW6r0Cnuqepyi9xZJOsKXehrQR2Kn7jyBG/lkHgny18yQ/O4zox49n +mJw== MIME-Version: 1.0 Received: by 10.14.211.3 with SMTP id v3mr3444919eeo.43.1345151640535; Thu, 16 Aug 2012 14:14:00 -0700 (PDT) Received: by 10.14.209.201 with HTTP; Thu, 16 Aug 2012 14:14:00 -0700 (PDT) In-Reply-To: References: Date: Fri, 17 Aug 2012 07:14:00 +1000 Message-ID: Subject: Re: [PATCH] Copying Symlinks From: Kai Willadsen To: Jeff Oliver Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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, 16 Aug 2012 21:14:18 -0000 On 17 August 2012 06:47, Jeff Oliver wrote: > A friend of mine was attempting to use Meld for diffing and merging > directories that contained a mixture of files and links. It ends up being a > bit unintuitive as to what you end up seeing when you look at a directory > diff with links. > > 1) There is no indication that a file is really a link. Yeah, this is a real problem. It wouldn't be hard to display something; it's just that we don't currently have any additional columns or cellrenderers in the directory comparison to show extra detail. More of a decide-on-the-UI problem than anything else. > 2) A link may end up being different if the dereferenced files are > different. This can happen 2 ways. First the links are the same but the > files they point to are different in each window or if the links are > different and the files are different. IIRC, there's no direct comparison of symlinks going on in Meld. We have some extra handling for following directory symlinks, and file symlinks are just treated as files (except when copying). Symlinks should only ever show as different when the files they point to are actually different. ...if that's not what you're seeing, please do file a bug. > If the files end up being the same, > but the links are different, I think you end up seeing a little star in the > icon. The star indicates recency, nothing else. The file with the star has the most recent mtime of all the files/directories in that row. > 3) Attempting to copy a link in either direction fails with an error dialog > indicating that you cannot copy the file. That... shouldn't happen. If you're just copying a link across, it should definitely work. Looking at misc.copy2(), it seems like we don't handle the case where you're copying a symlink over another file. Is that the problem you're seeing? > I made a quick and probably dirty patch to allow my friend to use meld for > links. All this patch attempts to address is last item, at least making it > usable in copying links from dir to dir. > > There is no extensive testing of the patch, but I'd like to have someone > have a look at it. So the idea behind the patch seems okay to me, but we do already try to handle symlinks in misc.copy2(). Before making any changes to this (symlinks have been a pain point in the past) I'd like to be certain what's not working. cheers, Kai From headrevision@gmail.com Fri Aug 24 07:38:55 2012 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 27138750067 for ; Fri, 24 Aug 2012 07:38:55 +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 menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sgTP5MxOGX-D for ; Fri, 24 Aug 2012 07:38:47 +0000 (UTC) Received: from mail-ob0-f182.google.com (mail-ob0-f182.google.com [209.85.214.182]) by menubar.gnome.org (Postfix) with ESMTP id 4FF1175006E for ; Fri, 24 Aug 2012 07:38:46 +0000 (UTC) Received: by obbun3 with SMTP id un3so6575044obb.27 for ; Fri, 24 Aug 2012 00:38:45 -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=1eSVFXnrlwT8ebBF0dZR4PLlqSwnqcQzGXT/KOVfayQ=; b=t4EV5fISTdc4z451mafCV63ALWVdLdfaeRVDtWljSauD6kAAyG+3TleSDBESKC02gU 7jQltn+JThyrtoRExpA2LXVxei7AALLzEBsnJwNFoj7nzPFki1xCelrfBWAvxZ5uszeL ofOjW/tLJhcMST70CoZL2DJzK37+2Oy5z/BTO6Q/M7UGMdQMvfQqHH/5uSw5lHt8Q64M X3nN+lfS5zlheDAltCZLF/yPn48LdxG9FMYUidpSDPJ6RdPK14rRxtWH6JhBJDZ48lSI /QSFt0+PtPlqQribhxslF+2KBnQ0s8CHe5Drs5yO5y+guM+IltQwUTgQENmLlJkZQj4x TZ4Q== MIME-Version: 1.0 Received: by 10.60.12.8 with SMTP id u8mr3217789oeb.46.1345793925512; Fri, 24 Aug 2012 00:38:45 -0700 (PDT) Received: by 10.182.0.231 with HTTP; Fri, 24 Aug 2012 00:38:45 -0700 (PDT) Date: Fri, 24 Aug 2012 09:38:45 +0200 Message-ID: Subject: Exchange of diffs From: Fabian Kiss To: meld-list@gnome.org Content-Type: multipart/alternative; boundary=e89a8fb1ef56deff6d04c7fe1069 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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, 24 Aug 2012 07:38:55 -0000 --e89a8fb1ef56deff6d04c7fe1069 Content-Type: text/plain; charset=ISO-8859-1 Hi Meld people, One feature I would really appreciate: To be able to exchange a diff with another Meld user. Possible solution: You compare two (or more) local files and export that diff as a single file which comprises the two files as well as the information which file to compare with the other. You send that file to another Meld user (eg. by IM) and she exports it to her Meld. Meld creates the two files locally (/tmp) and the diff is triggered. What do you think about it? --e89a8fb1ef56deff6d04c7fe1069 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi Meld people,

One feature I would really appreciate: T= o be able to exchange a diff with another Meld user.

Possible solution: You compare two (or more) local files and export that= diff as a single file which comprises the two files as well as the informa= tion which file to compare with the other. You send that file to another Me= ld user (eg. by IM) and she exports it to her Meld. Meld creates the two fi= les locally (/tmp) and the diff is triggered.

What do you think about it?

--e89a8fb1ef56deff6d04c7fe1069-- From kai.willadsen@gmail.com Sun Aug 26 04:55:08 2012 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 817BB7501A4 for ; Sun, 26 Aug 2012 04:55:08 +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 menubar.gnome.org ([127.0.0.1]) by localhost (menubar.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7ZD6syJupEad for ; Sun, 26 Aug 2012 04:54:54 +0000 (UTC) Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by menubar.gnome.org (Postfix) with ESMTP id A5A4075009E for ; Sun, 26 Aug 2012 04:54:53 +0000 (UTC) Received: by eeke52 with SMTP id e52so1429622eek.27 for ; Sat, 25 Aug 2012 21:54:51 -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=a8tvyA9sDkqFIha9fIpx85n2M1n/t7rLy4HTPHJtyTg=; b=BK1pnClqydcN5PNPlVcGuKdM006FUXlkutesZ9MYTTrTcLSxLQyQsvspU1Sr1kE28z GQ63/0zPvM0wzCPP1k0wHSFs4kZv9ia82sxtccKubhPTnhsyN/L9rGcI7vfGECdeV8/W IwDYRIo6bmn39MUjCUM+yUpJDCcdO2wey49IQmG5bmJ4BJ2G7ITraEuZkgO6IjGtD583 EtzJg0V5bz3SGLDgYETQ+56K8aVNVgSvFgYJCdQcB0ZCjE/CBdfiAwLql39/29b0a824 fZ3ydPn7QTQuPVBiGvGj9JPoMetVQIFybTqLQb7xI2k70nXP3AWKKHppqtj6bWDwEnum RNvQ== MIME-Version: 1.0 Received: by 10.14.215.193 with SMTP id e41mr12879888eep.44.1345956891216; Sat, 25 Aug 2012 21:54:51 -0700 (PDT) Received: by 10.14.209.201 with HTTP; Sat, 25 Aug 2012 21:54:51 -0700 (PDT) In-Reply-To: References: Date: Sun, 26 Aug 2012 14:54:51 +1000 Message-ID: Subject: Re: Exchange of diffs From: Kai Willadsen To: Fabian Kiss Content-Type: text/plain; charset=UTF-8 Cc: meld-list@gnome.org X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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, 26 Aug 2012 04:55:08 -0000 On 24 August 2012 17:38, Fabian Kiss wrote: > Hi Meld people, > > One feature I would really appreciate: To be able to exchange a diff with > another Meld user. > > Possible solution: You compare two (or more) local files and export that > diff as a single file which comprises the two files as well as the > information which file to compare with the other. You send that file to > another Meld user (eg. by IM) and she exports it to her Meld. Meld creates > the two files locally (/tmp) and the diff is triggered. > > What do you think about it? If I understand correctly, you're just talking about being able to use Meld to create and apply a patch? You can already create patches for single files within Meld (from a file comparison, go to "File->Format as patch"), though you can't currently do that for whole directories. The second part of this is applying a patch within Meld. This is an old request, as has had several implementations over the years, none of which have actually made it in yet. The latest is Piotr's patch view mode (see https://bugzilla.gnome.org/show_bug.cgi?id=674557), which looks pretty good. Unfortunately I haven't been able to find the time to review it properly... but certainly people testing it out and reporting their experiences in that bug would help to get it accepted. cheers, Kai From louis@obsidian.com.au Tue Aug 28 05:28:14 2012 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 7C1CC75007F for ; Tue, 28 Aug 2012 05:28:14 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -4.122 X-Spam-Level: X-Spam-Status: No, score=-4.122 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_MED=-2.3, TW_BZ=0.077] autolearn=ham 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 RnhQlNM8ZcaB for ; Tue, 28 Aug 2012 05:28:12 +0000 (UTC) Received: from na3sys009aog103.obsmtp.com (na3sys009aog103.obsmtp.com [74.125.149.71]) by menubar.gnome.org (Postfix) with SMTP id 2DD3075009C for ; Tue, 28 Aug 2012 05:28:11 +0000 (UTC) Received: from mail-ie0-f174.google.com ([209.85.223.174]) (using TLSv1) by na3sys009aob103.postini.com ([74.125.148.12]) with SMTP ID DSNKUDxW6noyYoQkgN9SjDnDrxDHnXBNKl6l@postini.com; Mon, 27 Aug 2012 22:28:12 PDT Received: by ieje11 with SMTP id e11so24644iej.5 for ; Mon, 27 Aug 2012 22:28:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:from:date:message-id:subject:to:content-type :x-gm-message-state; bh=jLQhg1uFqeI2oJllxMnYKn7n2faRnm+cnFenEcQ0JaA=; b=gy0vArb73qj0x5REJ1N9TfSlS3BJek4ERH7+TTfnVPOSMm0dNop4V8t/6eijuJLs7U EBhHNTzA9dr8sFejxyO9tKA+3YJ/aPpawIM3SBEJ7OwlFz7Wa+jVjDanW27/CpQPoib7 cD1ZT9CmqfW3PxvO5vOOCfoaHDdmRK3xXqbJLi8kld3NikI8f6Uorfws+PWoyz9x5W6d 5AXDKCDOERcRSPvjr76KyUwkKa1dNJUFYJ1GWpttsGA/ACKb4eBqGm/XMJCHKpylu6M8 y1tRRW2FEPehBWI7uTKkp2y6YqGX0QIUH92iFaifmkwJcEnM6Vav3iuvGGy0kXx637Xp t6TQ== Received: by 10.50.209.41 with SMTP id mj9mr12488895igc.23.1346131690059; Mon, 27 Aug 2012 22:28:10 -0700 (PDT) MIME-Version: 1.0 Received: by 10.64.90.169 with HTTP; Mon, 27 Aug 2012 22:27:49 -0700 (PDT) From: Louis des Landes Date: Tue, 28 Aug 2012 15:27:49 +1000 Message-ID: Subject: Bug with meld using bzr when file attributes change To: meld-list Content-Type: multipart/alternative; boundary=14dae9340afb34f8c604c84cb5b6 X-Gm-Message-State: ALoCoQnRtW/Ux+oPlo+ZX2rdGhyrU8YV4+eIj3IbZCFX0aLVNLaXkiKTFEuEqSNxk5LuLWmUUHXE X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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, 28 Aug 2012 05:28:14 -0000 --14dae9340afb34f8c604c84cb5b6 Content-Type: text/plain; charset=ISO-8859-1 It seems that if you change the attributes on a file, the bzr diff command reports this, but meld has no idea what to do with the line === modified file 'local/scripts/setup/setup.py' (properties changed: -x to +x) Requested info accd to meld is below: - meld version: '1.6.0' - source control software type: 'Bazaar-NG' $ bzr --version Bazaar (bzr) 2.5.1 Python interpreter: /usr/bin/python2 2.7.3 Python standard library: /usr/lib/python2.7 Platform: Linux-3.4.9-1-ARCH-x86_64-with-glibc2.2.5 bzrlib: /usr/lib/python2.7/site-packages/bzrlib - the output of 'bzr --no-aliases --no-plugins diff somefile.txt' === modified file 'local/scripts/setup/setup.py' (properties changed: -x to +x) --- local/scripts/setup/setup.py 2012-03-30 07:10:53 +0000 +++ local/scripts/setup/setup.py 2012-08-28 02:38:48 +0000 @@ -148,6 +148,21 @@ This is to call the script to import a list of servers """ ServerImporter().syncServerList(dstore) + +def addUsageDefns(dstore): + """ + Add the netflow inbound and outbound resources to the Total Traffic + resource + """ + group_id = dstore.resource.getResourceGroupIdByName('Total Traffic') + defnid = dstore.genericUsage.getDefnByName('Netflow-v5')['defnid'] + + resourceid = dstore.resource.getResourceIdByName('Outbound') + dstore.resource.addResourceToGroup(group_id, defnid, + 'default', resourceid) + resourceid = dstore.resource.getResourceIdByName('Inbound') + dstore.resource.addResourceToGroup(group_id, defnid, + 'default', resourceid) if __name__ == '__main__': import sys @@ -182,6 +197,8 @@ setupAdmin(dstore) print 'customize database' customizeDatabase(dstore) + print 'Usage Defns' + addUsageDefns(dstore) print 'Ldap sync' ldapSync() print 'Import Servers sync' - patch command: 'patch -p0 -R -d /tmp/tmp_shkCA-meld' -- Louis --14dae9340afb34f8c604c84cb5b6 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable

It seems that if you change the attributes = on a file, the bzr diff command reports this, but meld has no idea what to = do with the line

=3D=3D=3D modified file 'local/scripts/setup/setup.py' = (properties changed: -x to +x)

Requested info accd to meld is below:

- meld version: '1.6.0'

- source control software= type: 'Bazaar-NG'

$ bzr --version

Bazaar = (bzr) 2.5.1

=A0 Python interpreter: /usr/bin/python2 2.7.3

=A0 Python st= andard library: /usr/lib/python2.7

=A0 Platform: Linux-3.4.9-1-AR= CH-x86_64-with-glibc2.2.5

=A0 bzrlib: /usr/lib/python2.7/site-pac= kages/bzrlib

- the output of 'bzr --no-aliases --no-plugin= s diff somefile.txt'

=3D=3D=3D modified file 'local/scripts/setup/setup.py' (prop= erties changed: -x to +x)

--- local/scripts/set= up/setup.py 2012-03-30 07:10:53= +0000
++= + local/scripts/setup/setup.py = 2012-08-28 02:38:48 +0000

@@ -148,6 +148,21 @@<= /font>
=A0 =A0 = =A0This is to call the script to import a list of servers

=A0 =A0 =A0"""<= /div>
=A0 =A0 =A0Serve= rImporter().syncServerList(dstore)
+ =A0 =A0

+def addUsageDefns(ds= tore):
+ = =A0 =A0"""
+ =A0 =A0Add the netflow inbound and outbound resources to= the Total Traffic

+ =A0 =A0resource
+ =A0 =A0&qu= ot;""
+ =A0 =A0group_id =3D dstore.resource.getResourceGroupIdByName('= Total Traffic')

+ =A0 =A0defnid =3D d= store.genericUsage.getDefnByName('Netflow-v5')['defnid']
+

+ =A0 =A0resourceid =3D dst= ore.resource.getResourceIdByName('Outbound')
+ =A0 =A0dstore.resource.addRes= ourceToGroup(group_id, defnid,=A0

+ =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0'default', resourceid)
+ =A0 =A0resourceid =3D d= store.resource.getResourceIdByName('Inbound')

+ =A0 =A0dstore.resou= rce.addResourceToGroup(group_id, defnid,=A0
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0'default', resourceid) =A0 =A0

=A0
=A0if __name__ =3D=3D '= ;__main__':
=A0 =A0 =A0import sys

@@ -182,6 +197,8 @@
=A0 =A0 = =A0 =A0 =A0setupAdmin(dstore)
=A0 =A0 =A0 =A0 =A0print 'customize database'<= /font>

=A0 =A0 =A0 =A0 =A0cu= stomizeDatabase(dstore)
+ =A0 =A0 =A0 =A0print 'Usage Defns'
+ =A0 =A0 =A0 =A0addUsag= eDefns(dstore)

=A0 =A0 =A0 =A0 =A0pr= int 'Ldap sync'
=A0 =A0 =A0 =A0 =A0ldapSync()
=A0 =A0 =A0 =A0 =A0print 'Import Se= rvers sync'

- patch command: 'pat= ch -p0 -R -d /tmp/tmp_shkCA-meld'

--
Louis

--14dae9340afb34f8c604c84cb5b6-- From kai.willadsen@gmail.com Wed Aug 29 22:19:43 2012 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 0D18F750517 for ; Wed, 29 Aug 2012 22:19:43 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.623 X-Spam-Level: X-Spam-Status: No, score=-2.623 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, TW_BZ=0.077] autolearn=ham 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 kJEHyAZXskdd for ; Wed, 29 Aug 2012 22:19:41 +0000 (UTC) Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by menubar.gnome.org (Postfix) with ESMTP id 1FBBD750207 for ; Wed, 29 Aug 2012 22:19:40 +0000 (UTC) Received: by eeke52 with SMTP id e52so576348eek.27 for ; Wed, 29 Aug 2012 15:19:39 -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=xyBb3ie6ugTB4DFAXCd6bXgvHU/VEYAiaI1ba9tkCZc=; b=O8MgzE6yDJDFAgjW2C0hnHVACjcsaJiMxVmaVYum5obB3XPV+1K8sVmPHwo/2SOOyh ZrN3puDpJoewCkSXbSvezjHpnrxL231w077KrpsWuguloZYsNUqGSVkBT4KmXZxK8mNL S2Ex7ABc8IjbtEBBzabmZoq1IXIIIQMC+akduV3515RsyjvQGdcJJvWrcCrJ2YCO8B6j 7VVVkqcDEtU+jmxo0IzdRHZcmBjsYwc2EbQUj5LmgqxaNsmbmj0X0uyIB36yd42jagY4 b9vnIAdtuPWcrrDhS0jhZs3nGyatx6JbBf3wqQ0ZW1DwBpjiqaS2lE717mHag0k5NwsX rF9w== MIME-Version: 1.0 Received: by 10.14.221.197 with SMTP id r45mr3977896eep.41.1346278779038; Wed, 29 Aug 2012 15:19:39 -0700 (PDT) Received: by 10.14.209.201 with HTTP; Wed, 29 Aug 2012 15:19:39 -0700 (PDT) In-Reply-To: References: Date: Thu, 30 Aug 2012 08:19:39 +1000 Message-ID: Subject: Re: Bug with meld using bzr when file attributes change From: Kai Willadsen To: Louis des Landes Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.14 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, 29 Aug 2012 22:19:43 -0000 On 28 August 2012 15:27, Louis des Landes wrote: > It seems that if you change the attributes on a file, the bzr diff command > reports this, but meld has no idea what to do with the line > === modified file 'local/scripts/setup/setup.py' (properties changed: -x to > +x) This was just our patch regex being overly restrictive. I've pushed a fix. Thanks for the bug report. cheers, Kai