[svk-commit] r3024 - branches/2.1-releng

[nobody at bestpractical.com]

Author: jshirley
Date: Tue Jul 29 22:19:06 2008
New Revision: 3024

Added:
   branches/2.1-releng/CHANGES

Log:
Changelog for 2.2 release

Added: branches/2.1-releng/CHANGES
==============================================================================
--- (empty file)
+++ branches/2.1-releng/CHANGES	Tue Jul 29 22:19:06 2008
@@ -0,0 +1,124 @@
+[Changes for 2.2.0 - 29 Jul, 2008]
+
+  New features
+    * Branch support as 'svk branch' subcommand
+    * SVKBATCHMODE environment variable
+
+  Dependency
+    * Require Time::Progress (instead of Term::ProgressBar)
+
+  Mirror subsystem
+    * Fix a bug when mirroring a copy revision with unnormalized
+      revision outside mirror anchor and newer th an anchor head.
+
+  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
+
+  svk add
+
+  svk annotate
+
+  svk branch
+    * Creating an offline branch on trunk will not create a local branch called
+      trunk
+    * The --info option now displays the large revision it was merged from
+    * --create will fail if the target exists in the local svk repository
+    * -a is now available to mean --all
+    * New `svk branch --pull' command, accepts the following options:
+        * --lump
+        * --local
+        * --from <source branch>
+        * --from <source branch> <destination branch>
+    * svk br --checkout to checkout path works
+    * --from BRANCH
+    * --from-tag
+    * Fixes so svk shows the proper branch name (branch xxx/yyy only showed xxx)
+    * Fixes so svk can trace project ancestory better when a branch goes offline
+     
+  svk checkout
+
+  svk commit
+    * A property may have a conflict when the node is ok, so combine them in the
+      target list.
+
+  svk copy
+
+  svk delete
+
+  svk describe
+
+  svk depot
+
+  svk diff
+
+  svk info
+
+  svk list
+
+  svk log
+
+  svk merge
+    * Don't write to the log if it is a check run, regardless of -l option
+
+  svk mirror
+    * New bootstrap option to create a repository from an svn dump file
+
+  svk move
+
+  svk patch
+
+  svk proplist, propget
+
+  svk pull
+
+  svk push
+
+  svk revert
+  
+  svk resolved
+    * svk resolved will resolve all conflicts in a checkout path
+
+  svk smerge
+
+  svk status
+
+  svk sync
+
+  svk switch
+
+  svk update
+    * Add custom svk:merge property resolver handler
+
+  Tools
+
+  Internal
+    * svk will not clobber upstream Log::Log4perl configurations
+