summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorbad <bad@pkgsrc.org>2008-11-17 23:33:37 +0000
committerbad <bad@pkgsrc.org>2008-11-17 23:33:37 +0000
commita2908fff2fdc6dab1ded3977742c259bab5012b8 (patch)
treedb8f15b10b85e0a5a276c9529d5a2a63dd084bb0 /devel
parent348895e11f958dbd0a134a6b05d5f9947493f8bc (diff)
downloadpkgsrc-a2908fff2fdc6dab1ded3977742c259bab5012b8.tar.gz
Update SVK to 2.2.1.
Changes since 2.0.2 are: [Changes for 2.2.1 - 22 Oct, 2008] Fix the incorrect version information in META.yml Mirror subsystem * Fix memory leak for bootstrapping mirrors. [Changes for 2.2.0 - 17 Sep, 2008] New features * Branch support as 'svk branch' subcommand * SVKBATCHMODE environment variable Dependency * Require Time::Progress Mirror subsystem * New bootstrap option to initialize a mirror from an svn dump file, which can be an URL stored on the svk:dump-url property on the server * When committing or merging to a mirror, avoid roundtripping the latest revision (requires Subversion 1.5) * Fix a bug when mirroring a copy revision with unnormalized revision outside mirror anchor and newer th an anchor head * Fix URI escape issues for pushing changes to mirrors * Support mirroring a source that was renamed from somewhere else * Fix svk sync where a copy is made from revisions condensed with snapshot made by previous sync --skipto Merge subsystem * Bugfixes for opened file handle passed to editor under win32, causing file to be opened as read-only * Fix a problem that merge-ticket might be reverted on mirror in some cases * Fix a bug when merging a copy with modification to the copied source, it might cause checksum error * Addition of equality check for merge tickets * Better conflict handling that remembers the type of conflict, handling of data from the merge editor Tests * Test coverage for offlining existing branches (both offline and online) * TODO tests for renaming of an intermediate branch tracking * Test coverage for pulling into a branch from a local branch * Test coverage for checking out to a path from svk br --checkout * Test coverage for modifying property changes (including conflicts) * Fixed tests for baseless smerge * Test coverage for switching a branch and proper handling of merge tickets General * General Documentation cleanup * Documentation for SVK::Info properly matches expected output * Conversion to use SVK::Log (and Log::Log4perl) for output * Add an option of '0' to select "No project" if there is not a project to use while mirroring a new URI * svk will not set property status as modified when a path is added or replaced * svk now stores known conflict types (provided by merge editor) in .conflict property * General usability for working with files no longer exists in HEAD svk commit * A property may have a conflict when the node is ok, so combine them in the target list svk merge * Don't write to the log if it is a check run, regardless of -l option svk resolved * svk resolved will resolve all conflicts in a checkout path svk update * Add custom svk:merge property resolver handler to handle merging of merge tickets properly Internal * svk will not clobber upstream Log::Log4perl configurations
Diffstat (limited to 'devel')
-rw-r--r--devel/svk/Makefile14
-rw-r--r--devel/svk/distinfo8
2 files changed, 11 insertions, 11 deletions
diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index b2a7edf51bc..8f513334de4 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.30 2008/10/19 19:18:09 he Exp $
+# $NetBSD: Makefile,v 1.31 2008/11/17 23:33:37 bad Exp $
-DISTNAME= SVK-v2.0.2
-PKGNAME= svk-2.0.2
-PKGREVISION= 1
+DISTNAME= SVK-v2.2.1
+PKGNAME= svk-2.2.1
CATEGORIES= devel perl5 scm
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=OurNet/CLKAO/}
-MAINTAINER= sommerfeld@NetBSD.org
-HOMEPAGE= http://svk.elixus.org/
+MAINTAINER= bad@NetBSD.org
+HOMEPAGE= http://svk.bestpractical.com/
COMMENT= Decentralized version control system built on Subversion
PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -17,7 +16,7 @@ PERL5_PACKLIST= auto/SVK/.packlist
MAKE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--skip
-DEPENDS+= p5-subversion>=1.3.0:../../devel/p5-subversion
+DEPENDS+= p5-subversion>=1.4.0:../../devel/p5-subversion
DEPENDS+= p5-Algorithm-Annotate>=0.10:../../devel/p5-Algorithm-Annotate
DEPENDS+= p5-Algorithm-Diff>=1.19.01:../../devel/p5-Algorithm-Diff
DEPENDS+= p5-App-CLI>=0.07:../../devel/p5-App-CLI
@@ -44,6 +43,7 @@ DEPENDS+= p5-Pod-Simple>=3.02:../../textproc/p5-Pod-Simple
DEPENDS+= p5-SVN-Mirror>=0.71:../../devel/p5-SVN-Mirror
DEPENDS+= p5-SVN-Simple>=0.27:../../devel/p5-SVN-Simple
DEPENDS+= p5-Term-ReadKey>=2.30:../../devel/p5-Term-ReadKey
+DEPENDS+= p5-Time-Progress>=1.3:../../time/p5-Time-Progress
DEPENDS+= p5-URI>=1.30:../../www/p5-URI
DEPENDS+= p5-UNIVERSAL-require>=0.10:../../devel/p5-UNIVERSAL-require
DEPENDS+= p5-YAML-Syck>=0.60:../../textproc/p5-YAML-Syck
diff --git a/devel/svk/distinfo b/devel/svk/distinfo
index 831bcf9708e..545f427b9bb 100644
--- a/devel/svk/distinfo
+++ b/devel/svk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2007/08/21 09:49:07 bad Exp $
+$NetBSD: distinfo,v 1.13 2008/11/17 23:33:37 bad Exp $
-SHA1 (SVK-v2.0.2.tar.gz) = 8d691c6e6b914e5b8e71ba75dee60b61fe90e54f
-RMD160 (SVK-v2.0.2.tar.gz) = 5eeaa465355cd3026f7230b120d83051705fc86d
-Size (SVK-v2.0.2.tar.gz) = 445041 bytes
+SHA1 (SVK-v2.2.1.tar.gz) = 5632ff4e2720c7adac8c77d28d801a7699a77e66
+RMD160 (SVK-v2.2.1.tar.gz) = 064ec2f47e5375fc01d8e77209f70c7ce0a5e08a
+Size (SVK-v2.2.1.tar.gz) = 520010 bytes