On Thu, Apr 02, 2009 at 02:13:26AM +0200, Vincent Legoll wrote: > On Thu, Apr 2, 2009 at 12:38 AM, Trent W. Buck <trentb...@gmail.com> wrote: >> On Wed, Apr 01, 2009 at 10:08:32PM +0200, Vincent Legoll wrote: >>> I don't understand your patch, my mercurial outputs >>> >>> diff -r 75ef8a4a74ad testdir/testsubdir/testsubdir.txt >>> >>> and not "diff --git" >> >> OK, perhaps it is because my .hgrc contains >> >> [diff] >> git = True >> >> ...because that's what I like on the command line, and meld doesn't >> understand to turn that off when it uses mercurial for its own >> purposes. > > OK, I wasn't aware of that hg diff mode. > But why turn it off when we can handle it properly ? ;-)
Sure, I didn't suggest that because it'd be more work :-) > Could you also try the attached patch (which is against r1312) > it tries to handle both hg diff modes. I tested it on hg standard > & git modes + svn (for non regression) Unfortunately Xorg is segfaulting for me lately, and I haven't bothered to fix it (I mostly work in xterm anyway). So I can't test this right away, but I'll leave it in my IN tray to get to when I can. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
