Skip to content

v0.4.0

Compare
Choose a tag to compare
@aik099 aik099 released this 11 Feb 09:35
· 148 commits to master since this release

Added

  • Added conflicts command for manually managing list of recorded conflicts in a working copy.
  • Added --ignore-externals option to update command to allow updating working copy without checking out externals.
  • Added --revision option to update command to allow updating working copy to a specific revision.
  • Added --update-revision option to merge command allowing to update working copy to given revision prior to merging.
  • Added --with-full-message option to log, merge and aggregate commands to display non-truncated commit messages.
  • Show progress bar during merging to indicate merged/total revision count.
  • When using revert command display list of recorded conflicts before deleting it.
  • Added different formats (merge templates), used during automatic merge commit log message generation.
  • Added empty merge template allowing to prevent merge information to be used during commit log message generation.
  • Added cfg alias to config command.
  • Added summary merge template to display only summary from performed merge in a commit log message.
  • Added --merge-template option to commit command to allow overriding merge template for this commit.
  • Added --record-only option to merge command for marking revisions as merged without actually merging them.
  • Added search command for finding where code was first added or last seen in a given working copy file.

Changed

  • The update command now also tracks conflicts resulted from problematic update.
  • The list of options for aggregate command is now built dynamically based on options of aggregated commands.
  • The merge command now specially ignores externals, when doing working copy update before merging.
  • The merge command now will do update, when locally deleted files are found.
  • The trailing empty lines are removed from displayed commit message for increased clarity.
  • The merge heading is more readable now, because "r123" was changed into "123 revision" (e.g. --- Merging 15512 revision into './core':).
  • The recorded conflicts are now sorted alphabetically.
  • Disallow searching for whitespace-only keywords using search command.
  • Obfuscate credentials displayed in error messages.
  • While looking for "bugtraq:logregexp" property of a project look at each ref instead of using last modified only.
  • Include source branch project name in commit message, when doing cross-project merge and source/target branches are named the same.

Fixed

  • Invalid merge source url was guessed for X.0.Z branches (e.g. 5.0.x).
  • The aggregate command was ignoring command aliases (e.g. up for update command).
  • Externals in a working copy caused Mixed revisions error before merge resulting in immediate update.
  • Locally deleted files in a working copy caused Mixed revisions error before merge resulting in immediate update.
  • When --refs argument of log was used the revisions not belonging to specified refs were also shown.
  • The merged revision heading (e.g. --- Merging r15512 into './core':) wasn't highlighted during merging.
  • Added files in a working copy caused Mixed revisions error before merge resulting in immediate update.
  • The merging heading wasn't shown, when fast network connection to Subversion server was used (command output buffer contained 2+ lines of text).
  • Current revision row highlighting also affected table markup instead of just affecting text inside cells.
  • Initial repository import using Subversion 1.9+ failed with Property 'bugtraq:logregexp' not found error.
  • Attempt to use "svn-buddy" inside sub-folder of a working copy ended up in exception for Subversion 1.7+ client.
  • It was possible to search for an empty keyword using "search" command.
  • The externals were shown in auto-generated commit message for commit command.
  • Deleted branches/tags of a project were introspected for a "bugtraq:logregexp" property resulting in Path ... not found in ... revision. error.