Mon Nov 17 23:33:37 2008 UTC ()
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


(bad)
diff -r1.30 -r1.31 pkgsrc/devel/svk/Makefile
diff -r1.12 -r1.13 pkgsrc/devel/svk/distinfo

cvs diff -r1.30 -r1.31 pkgsrc/devel/svk/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/svk/Attic/Makefile 2008/10/19 19:18:09 1.30
+++ pkgsrc/devel/svk/Attic/Makefile 2008/11/17 23:33:37 1.31
@@ -1,53 +1,53 @@ @@ -1,53 +1,53 @@
1# $NetBSD: Makefile,v 1.30 2008/10/19 19:18:09 he Exp $ 1# $NetBSD: Makefile,v 1.31 2008/11/17 23:33:37 bad Exp $
2 2
3DISTNAME= SVK-v2.0.2 3DISTNAME= SVK-v2.2.1
4PKGNAME= svk-2.0.2 4PKGNAME= svk-2.2.1
5PKGREVISION= 1 
6CATEGORIES= devel perl5 scm 5CATEGORIES= devel perl5 scm
7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=OurNet/CLKAO/} 6MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=OurNet/CLKAO/}
8 7
9MAINTAINER= sommerfeld@NetBSD.org 8MAINTAINER= bad@NetBSD.org
10HOMEPAGE= http://svk.elixus.org/ 9HOMEPAGE= http://svk.bestpractical.com/
11COMMENT= Decentralized version control system built on Subversion 10COMMENT= Decentralized version control system built on Subversion
12 11
13PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16PERL5_PACKLIST= auto/SVK/.packlist 15PERL5_PACKLIST= auto/SVK/.packlist
17 16
18MAKE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--skip 17MAKE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--skip
19 18
20DEPENDS+= p5-subversion>=1.3.0:../../devel/p5-subversion 19DEPENDS+= p5-subversion>=1.4.0:../../devel/p5-subversion
21DEPENDS+= p5-Algorithm-Annotate>=0.10:../../devel/p5-Algorithm-Annotate 20DEPENDS+= p5-Algorithm-Annotate>=0.10:../../devel/p5-Algorithm-Annotate
22DEPENDS+= p5-Algorithm-Diff>=1.19.01:../../devel/p5-Algorithm-Diff 21DEPENDS+= p5-Algorithm-Diff>=1.19.01:../../devel/p5-Algorithm-Diff
23DEPENDS+= p5-App-CLI>=0.07:../../devel/p5-App-CLI 22DEPENDS+= p5-App-CLI>=0.07:../../devel/p5-App-CLI
24DEPENDS+= p5-Class-Accessor>=0.25:../../devel/p5-Class-Accessor 23DEPENDS+= p5-Class-Accessor>=0.25:../../devel/p5-Class-Accessor
25DEPENDS+= p5-Class-Autouse>=1.15:../../devel/p5-Class-Autouse 24DEPENDS+= p5-Class-Autouse>=1.15:../../devel/p5-Class-Autouse
26DEPENDS+= p5-Class-Data-Inheritable>=0.06:../../devel/p5-Class-Data-Inheritable 25DEPENDS+= p5-Class-Data-Inheritable>=0.06:../../devel/p5-Class-Data-Inheritable
27DEPENDS+= p5-Compress-Zlib>=1.33:../../devel/p5-Compress-Zlib 26DEPENDS+= p5-Compress-Zlib>=1.33:../../devel/p5-Compress-Zlib
28DEPENDS+= p5-Data-Hierarchy>=0.30:../../devel/p5-Data-Hierarchy 27DEPENDS+= p5-Data-Hierarchy>=0.30:../../devel/p5-Data-Hierarchy
29DEPENDS+= p5-File-Temp>=0.17:../../devel/p5-File-Temp 28DEPENDS+= p5-File-Temp>=0.17:../../devel/p5-File-Temp
30DEPENDS+= p5-File-Type>=0.22:../../devel/p5-File-Type 29DEPENDS+= p5-File-Type>=0.22:../../devel/p5-File-Type
31DEPENDS+= p5-FreezeThaw>=0.43:../../devel/p5-FreezeThaw 30DEPENDS+= p5-FreezeThaw>=0.43:../../devel/p5-FreezeThaw
32DEPENDS+= p5-IO-Digest>=0.10:../../devel/p5-IO-Digest 31DEPENDS+= p5-IO-Digest>=0.10:../../devel/p5-IO-Digest
33DEPENDS+= p5-IO-Pager>=0.06:../../devel/p5-IO-Pager 32DEPENDS+= p5-IO-Pager>=0.06:../../devel/p5-IO-Pager
34DEPENDS+= p5-List-MoreUtils>=0.22:../../devel/p5-List-MoreUtils 33DEPENDS+= p5-List-MoreUtils>=0.22:../../devel/p5-List-MoreUtils
35DEPENDS+=p5-Locale-Maketext-Lexicon>=0.62:../../misc/p5-Locale-Maketext-Lexicon 34DEPENDS+=p5-Locale-Maketext-Lexicon>=0.62:../../misc/p5-Locale-Maketext-Lexicon
36DEPENDS+=p5-Locale-Maketext-Simple>=0.16:../../misc/p5-Locale-Maketext-Simple 35DEPENDS+=p5-Locale-Maketext-Simple>=0.16:../../misc/p5-Locale-Maketext-Simple
37DEPENDS+= p5-Path-Class>=0.16:../../devel/p5-Path-Class 36DEPENDS+= p5-Path-Class>=0.16:../../devel/p5-Path-Class
38DEPENDS+= p5-PathTools>=3.19:../../devel/p5-PathTools 37DEPENDS+= p5-PathTools>=3.19:../../devel/p5-PathTools
39DEPENDS+= p5-PerlIO-eol>=0.13:../../devel/p5-PerlIO-eol 38DEPENDS+= p5-PerlIO-eol>=0.13:../../devel/p5-PerlIO-eol
40DEPENDS+= p5-PerlIO-via-dynamic>=0.11:../../devel/p5-PerlIO-via-dynamic 39DEPENDS+= p5-PerlIO-via-dynamic>=0.11:../../devel/p5-PerlIO-via-dynamic
41DEPENDS+= p5-PerlIO-via-symlink>=0.02:../../devel/p5-PerlIO-via-symlink 40DEPENDS+= p5-PerlIO-via-symlink>=0.02:../../devel/p5-PerlIO-via-symlink
42DEPENDS+= p5-Pod-Escapes>=1.04:../../textproc/p5-Pod-Escapes 41DEPENDS+= p5-Pod-Escapes>=1.04:../../textproc/p5-Pod-Escapes
43DEPENDS+= p5-Pod-Simple>=3.02:../../textproc/p5-Pod-Simple 42DEPENDS+= p5-Pod-Simple>=3.02:../../textproc/p5-Pod-Simple
44DEPENDS+= p5-SVN-Mirror>=0.71:../../devel/p5-SVN-Mirror 43DEPENDS+= p5-SVN-Mirror>=0.71:../../devel/p5-SVN-Mirror
45DEPENDS+= p5-SVN-Simple>=0.27:../../devel/p5-SVN-Simple 44DEPENDS+= p5-SVN-Simple>=0.27:../../devel/p5-SVN-Simple
46DEPENDS+= p5-Term-ReadKey>=2.30:../../devel/p5-Term-ReadKey 45DEPENDS+= p5-Term-ReadKey>=2.30:../../devel/p5-Term-ReadKey
 46DEPENDS+= p5-Time-Progress>=1.3:../../time/p5-Time-Progress
47DEPENDS+= p5-URI>=1.30:../../www/p5-URI 47DEPENDS+= p5-URI>=1.30:../../www/p5-URI
48DEPENDS+= p5-UNIVERSAL-require>=0.10:../../devel/p5-UNIVERSAL-require 48DEPENDS+= p5-UNIVERSAL-require>=0.10:../../devel/p5-UNIVERSAL-require
49DEPENDS+= p5-YAML-Syck>=0.60:../../textproc/p5-YAML-Syck 49DEPENDS+= p5-YAML-Syck>=0.60:../../textproc/p5-YAML-Syck
50DEPENDS+= p5-version>=0.68:../../devel/p5-version 50DEPENDS+= p5-version>=0.68:../../devel/p5-version
51 51
52.include "../../lang/perl5/module.mk" 52.include "../../lang/perl5/module.mk"
53.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"

cvs diff -r1.12 -r1.13 pkgsrc/devel/svk/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/svk/Attic/distinfo 2007/08/21 09:49:07 1.12
+++ pkgsrc/devel/svk/Attic/distinfo 2008/11/17 23:33:37 1.13
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.12 2007/08/21 09:49:07 bad Exp $ 1$NetBSD: distinfo,v 1.13 2008/11/17 23:33:37 bad Exp $
2 2
3SHA1 (SVK-v2.0.2.tar.gz) = 8d691c6e6b914e5b8e71ba75dee60b61fe90e54f 3SHA1 (SVK-v2.2.1.tar.gz) = 5632ff4e2720c7adac8c77d28d801a7699a77e66
4RMD160 (SVK-v2.0.2.tar.gz) = 5eeaa465355cd3026f7230b120d83051705fc86d 4RMD160 (SVK-v2.2.1.tar.gz) = 064ec2f47e5375fc01d8e77209f70c7ce0a5e08a
5Size (SVK-v2.0.2.tar.gz) = 445041 bytes 5Size (SVK-v2.2.1.tar.gz) = 520010 bytes