Update to 1.1:

Version 1.1 - 2008-12-2

This is a larger feature release.

General:

    * Added 'resolve' command for better tracking of in-progress merges
    * Several speedups for status and diff commands (especially on Windows)
    * Some modules have been rewritten in C for greater speed
    * Compatibility with Python 2.6
    * Improved correctness in the face of casefolding filesystems
    * Fixed a possible race condition in pull
    * Fix support for context-size diff settings
    * Fixed several crashes on Windows related to code freezing
    * Don't complain when trying to load extensions twice
    * Allow C extensions to compile on Haiku
    * Allow for committing in-memory file contents
    * New repository format which limits path lengths in the store
    * Unclutter commands list by extracting extension commands into separate lists
    * static-http support is now a fallback for the general http support
    * Add some buffering to the templater
    * Better documentation on git diffs

Web interface:

    * Add a canvas-based repository graph
    * New and improved hgweb themes: paper, coal and monoblue
    * paper is now the new default style; the old default is now called 'spartan'
    * Better WSGI compliance
    * Collections now show nested repos (best used without a checkout)
    * diffs are more sensible, follow diff.git settings
    * Full author name available in annotate templates
    * Make it easier to add template paths in extensions
    * Support for allow_read/deny_read access controls
    * Working diff and file log for removed files
    * Better alternative for repository collections
    * Corrected feed link in gitweb theme
    * Fix a bug with CGIs running under IIS

Commands:

    * commit: print the revision ID when invoked with --verbose
    * resolve: new command to help keep track of merges
    * merge: only implicitly select same-branch heads
    * export: append instead of overwrite when exporting multiple changesets
    * bundle: added support for different compression types
    * rollback: clean up empty files
    * help: several more sections from the manual are available through hg help now
    * bisect: better documentation, give better feedback, option for scripted testing
    * branch: allow for resetting current branch name
    * patch: add a --similarity option to do rename/copy detection
    * tag: without a checkout, use tip as the tagging revision's parent
    * log: allow searching by user (with -u)
    * import: importing from URL now works with http authentication
    * unbundle: importing from URL now works
    * pull: with -u, still update if there's only one head on the current branch
    * diff: fix a problem with the --showfunc option

Extensions:

    * rebase: new extension to support rebasing changesets
    * bookmarks: new extension to provide (local-only) git-like branches
    * zeroconf: new extension to support publishing repositories through Zeroconf/Bonjour
    * hgcia: new extension to facilitate communication with CIA
    * mq:
          o qfinish: added command for conversion of patches into changesets
          o qpush/qgoto: gracefully abort when encountering guards
          o qrefresh: don't lose work when interrupted
          o qimport: allow for importing patches from URLs
          o qnew: abort early if patch already exists, be more careful in general
          o qdiff: now supports all diff options
          o qfold: more tolerance of file removals, better handling of commit messages
          o import: prevent import from working when patches are applied
    * convert:
          o added support for conversion from bzr repositories
          o incorporate an improved Python version of cvsps, replacing the external cvsps tool (see upgrade notes)
          o compatibility with recent git releases
          o add an option to start from an arbitrary revision
          o correctly encode characters in Subversion repository URLs
          o better, more tolerant tags detection
    * highlight:
          o remove need to pre-generate CSS stylesheet
          o compatibility with older Pygments versions
          o make the lexer guessing faster by not reading all of the file
          o allow demandimport to load it incrementally
    * fetch: improve support for named branches
    * graphlog:
          o now adds --graph options to log, incoming and outgoing
          o fix calls from outside the repository
    * inotify:
          o many bugfixes, should work much better
          o daemon is automatically started by default
    * color:
          o add colorization of diffs
          o add --color options to many commands
    * keywords: be more careful about expanding binary files
    * bugzilla: added support for Bugzilla 3.0
    * pager: allow per-command configuration
    * hgk: display branch names for revisions
    * churn: support for templated statistics report generation
    * patchbomb: charset encoding can now be configured
    * notify: charset encoding can now be configured

1 files changed, 2 insertions, 2 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index f9027c6e6dc..007b4adde04 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2008/08/31 13:12:23 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2008/12/02 23:08:26 wiz Exp $
 #
 
-DISTNAME=	mercurial-1.0.2
+DISTNAME=	mercurial-1.1
 CATEGORIES=	devel scm
 MASTER_SITES=	http://www.selenic.com/mercurial/release/