---
- branch: MAIN
  date: Sat Aug  2 07:04:18 UTC 2014
  files:
  - new: '1.6'
    old: '1.5'
    path: pkgsrc/devel/py-mercurial/Makefile.version
    pathrev: pkgsrc/devel/py-mercurial/Makefile.version@1.6
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/devel/py-mercurial/PLIST
    pathrev: pkgsrc/devel/py-mercurial/PLIST@1.3
    type: modified
  - new: '1.5'
    old: '1.4'
    path: pkgsrc/devel/py-mercurial/distinfo
    pathrev: pkgsrc/devel/py-mercurial/distinfo@1.5
    type: modified
  id: 20140802T070418Z.564680a19a09ba824e229b8df74a8591f6712191
  log: |
    Update to 3.1:

    Mercurial 3.1 (2014-08-01)

        backout: accept '--edit' like other commands creating new changeset
        bash_completion: add -l|--list support for shelve
        bookmarks: avoid deleting primary bookmarks on rebase
        bookmarks: improve the bookmark help (issue4244)
        branch: add debug message for branch cache write failure
        bugzilla: stop trying to cache setup across hook invocation
        build: initial support for in-tree autobuilding recipes
        buildrpm: include release version in .tar.gz name
        bundle2: add pushkey support
        bundle2: fix bundle2 pulling all revs on empty pulls
        commit: make commit message shown in text editor customizable by template
        config: allow 'user' in .hgrc ui section (issue3169)
        convert: detect removal of ".gitmodules" at git source revisions correctly
        convert: drastically speed up git conversions
        convert: mercurial source: convert global tags only - not local tags
        convert: only consider shamap revisions converted if they still exists
        convert: update the transplant, rebase and graft references in 'extra'
        diff: add nobinary config to suppress git-style binary diffs
        discovery: if a push would create a new head, mention the bookmark name if any
        filemerge: add internal:tagmerge merge tool
        filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety
        filemerge: use non-minimal conflict marker regions (BC)
        gpg: accept '--edit' like other commands creating new changeset
        graft: customize graft conflict markers (BC)
        help: always show command help with -h (issue4240)
        help: suggest keyword search when no topic is found
        histedit: respect revsetalias entries (issue4311)
        import: add --partial flag to create a changeset despite failed hunks
        largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
        largefiles: include largefiles when doing log on a directory (issue4241)
        largefiles: show also how many data entities are outgoing at "hg outgoing"
        largefiles: use "normallookup", if "mtime" of standin is unset
        log: allow revset for --follow to be lazily evaluated
        log: do not use exact matcher for --patch --follow without file (issue4319)
        log: make --patch --follow work inside a subdirectory
        make: add a basic osx mpkg target
        merge: add conflict marker formatter (BC)
        merge: define conflict marker labels in filemerge()
        mergetools.hgrc: add minimal configuration for editmerge
        packaging: move output directory from build/ to packages/
        pager: add attend-<command> option
        patchbomb: includes series information in the header
        pull: when remote supports it, pull phase data alongside changesets
        purge: add options for deleting only files or only directories
        push: use bundle2 to push phases when available
        qfold: allow to specify '--message/'--logfile' and '--edit' at the same time
        qimport: record imported revs incrementally (issue3874)
        qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time
        rebase: specify custom conflict marker labels for rebase (BC)
        resolve: abort when not applicable (BC)
        resolve: don't abort resolve -l even when no merge is in progress
        resolve: print message when no unresolved files remain (issue4214)
        resolve: print warning when no work performed (issue4208)
        revset: maintain ordering when subtracting from a baseset (issue4289)
        revset: optimize baseset.sub (issue4313)
        setup: fixed for Pythons which don't have a CFLAGS
        setup: make Xcode 5.1 check less specific
        shelve: accept '--edit' like other commands creating new changeset
        strip: drop -b/--backup option (BC)
        strip: remove bookmarks after strip succeed (issue4295)
        templatefilter: add splitlines function
        templatekw: add 'currentbookmark' keyword to show current bookmark easily
        templatekw: add 'subrepos' keyword to show updated subrepositories
        templater: introduce startswith function
        templater: introduce word function
        templates: escape NUL bytes in jsonescape (issue4303)
        update: introduce --tool for controlling the merge tool
        update: show message when a bookmark is activated by update
        update: specify custom conflict markers for update (BC)
        update: when deactivating a bookmark, print a message
        version: show enabled extensions (issue4209)
        version: don't traceback if no extensions to list (issue4312)
        vim: use try catch in vim plugin to avoid conflicts
  module: pkgsrc
  subject: 'CVS commit: pkgsrc/devel/py-mercurial'
  unixtime: '1406963058'
  user: wiz