head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.8
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.6
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.4
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.2
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.2.0.4
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.2
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.1.0.2
	pkgsrc-2010Q3-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2011.04.07.07.36.05;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2010.10.16.15.15.16;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	2010.08.09.11.33.53;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove unneeded patch after update.
@
text
@$NetBSD: patch-ac,v 1.2 2010/10/16 15:15:16 wiz Exp $

NetBSD patch doesn't support long options.
https://bugzilla.gnome.org/show_bug.cgi?id=632297

--- meld/vc/_vc.py.orig	2010-06-24 21:31:33.000000000 +0000
+++ meld/vc/_vc.py
@@@@ -106,7 +106,7 @@@@ class Vc(object):
     def resolved_command(self):
         raise NotImplementedError()
     def patch_command(self, workdir):
-        return ["patch","--strip=%i"%self.PATCH_STRIP_NUM,"--reverse","--directory=%s" % workdir]
+        return ["patch","-p%i"%self.PATCH_STRIP_NUM,"-R","-d%s" % workdir]
 
     def check_repo_root(self, location):
         if not os.path.isdir(os.path.join(location, self.VC_DIR)):
@


1.2
log
@Update to 1.4.0. Send patch-ac upstream and add comment.

2010-09-27 meld-1.4.0
=====================

    * Fix committing with RCS (Iuri Diniz)

    * Fix compatibility with old PyGObject (Kai Willadsen)

    * Translation updates:
      hu (Gabor Kelemen)
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.1 2010/08/09 11:33:53 drochner Exp $
@


1.1
log
@update to 1.3.2
changes:
-Add keyboard merging, bulk change merging, auto-merge with ancestor mode
-Updates to VC support, including lots of git fixes
-UI cleanups
-bug fixes
-Translation updates
@
text
@d1 4
a4 1
$NetBSD$
@