[svk-commit] r3058 - trunk

nobody at bestpractical.com nobody at bestpractical.com
Mon Aug 4 16:17:41 EDT 2008


Author: clkao
Date: Mon Aug  4 16:17:04 2008
New Revision: 3058

Added:
   trunk/CHANGES
      - copied, changed from r3024, /branches/2.1-releng/CHANGES
   trunk/CHANGES-2.0
      - copied, changed from r2281, /trunk/CHANGES

Log:
changelogs.


Copied: trunk/CHANGES (from r3024, /branches/2.1-releng/CHANGES)
==============================================================================
--- /branches/2.1-releng/CHANGES	(original)
+++ trunk/CHANGES	Mon Aug  4 16:17:04 2008
@@ -1,123 +1,73 @@
-[Changes for 2.2.0 - 29 Jul, 2008]
+[Changes for 2.2.0 - 11 Aug, 2008]
 
   New features
     * Branch support as 'svk branch' subcommand
     * SVKBATCHMODE environment variable
 
   Dependency
-    * Require Time::Progress (instead of Term::ProgressBar)
+    * 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.
+      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.
+      causing file to be opened as read-only
     * Fix a problem that merge-ticket might be reverted on mirror
-      in some cases.
+      in some cases
     * Fix a bug when merging a copy with modification to the copied
-      source, it might cause checksum error.
+      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
+    * 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)
+
+    * 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
+    * 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.
+    * 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
+    * General usability for working with files no longer exists in HEAD
      
-  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
+    * 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 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
+    * Add custom svk:merge property resolver handler to handle merging
+      of merge tickets properly
 
   Internal
     * svk will not clobber upstream Log::Log4perl configurations

Copied: trunk/CHANGES-2.0 (from r2281, /trunk/CHANGES)
==============================================================================
--- /trunk/CHANGES	(original)
+++ trunk/CHANGES-2.0	Mon Aug  4 16:17:04 2008
@@ -1,3 +1,81 @@
+[Changes for 2.0.2 - 20 Jul, 2007]
+
+  Mirror subsystem
+    * be more friendly when trying to relocating incorrect mirror
+      path.
+
+  Merge subsystem
+    * Fix a problem when repeatedly merging renames tracked with
+      --track-renames, and when merging back such files.
+    * Fix the "file not found at revision 0" bug when smerge to a
+      mirror where copy source is not normalized.
+    * Fix a bug that deletes inside copies aren't properly merged
+      across branches even the status output says so.
+    * Fix a bug when merging copies across branches we be using
+      incorrect dst revision causing "file not found at revision 0".
+    * Fix a bug where copies outside the mirror source across merge
+      are not expanded as non-copies.
+    * Fix an inconsistency for smerge -IC behaviour when the base is
+      a txn path.
+
+  Pullyu
+    * properly translate to local path when mirroring remote root.
+    * Fix pullyu for translating "included" records, which are
+      replaced entries.
+
+  Others
+    * Improve error reporting when failed to save config.
+    * Perl 5.9.5 compatibility fixes.
+    * Work around a problem that push -P might be using outdated
+      memory pool.
+    * svk diff -r:123 should report invalid -r rather than blow up.
+    * Add -i as shorthand for --interactive in svk ci.
+    * Various win32 fixes.
+    * Various i18n fixes.
+
+[Changes for 2.0.1 - 26 Mar, 2007]
+
+  Mirror subsystem
+    * You can now use $SVKNORAREPLAY forcing svk to use old SVN::Mirror
+      for sync.
+    * Fix a bug when mirroring partial repository with copies, the from
+      revision number might not be exactly the ones we have mirrored.
+    * In the pipelined sync editor, use pool more wisely for invoking
+      editor calls.  This fixes the memory bloat for syncing revisions
+      with large number of deleted files.
+    * In pipelined replay, make perl don't segfault on SIGINT.
+    * Fix the bug committing to subdirs of mirrors that are on /.
+    * Fix a bug preventing mirror --relocate to work on mirrors on '/'.
+    * Fix a problem replaying failing with RA_DAV_REQUEST_FAILED in some
+      servers.
+
+  Merge subsystem
+    * Fix a pool usage in Editor::Merge::apply_textdelta, which has a
+      side-effect causing rename-tracking smerge on a new file inside a
+      renamed directory to fail with SWIG-runtime error.
+    * Prevent unwanted repeated merges when repeatedly merging tags to a
+      branch.  We now also record the copy source(s) of the path being
+      merged from in the merge ticket.
+    * Fix a bug in merging moved files that are modified.
+    * Fix a bug that smerge to checkout with changes to a copied file is
+      causing incomplete svn delta string.
+    * When merging the replaced directory, do not ignore the fact when
+      the delete part is already conflicting.
+    * Fix a bug when merging a copy that happened on an intermediate
+      branch, which might not map back to the merge destination.
+
+  Tools
+    * verify-mirror improvements.
+    * Ship vc-svk.el with the distribution.
+
+  Others
+    * Make updating a checkout that no longer exists in the depot give
+      proper message.
+    * Make checkout more robust when resuming a interrupted checkout.
+    * Check for .svk/floating before assuming floating checkout.
+    * Fix a regression which caused binary files to sometimes be
+      displayed as text during an "svk diff".
+
 [Changes for 2.0.0 - 28 Dec, 2006]
 
   Dependency


More information about the svk-commit mailing list