Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11]) by www.NetBSD.org (Postfix) with ESMTP id F212963B874 for ; Fri, 11 Mar 2011 10:12:54 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id C682919D17A; Fri, 11 Mar 2011 10:12:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E873419D179 for ; Fri, 11 Mar 2011 10:12:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Mc2bbk0k0-Q5 for ; Fri, 11 Mar 2011 10:12:52 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 3544919D172 for ; Fri, 11 Mar 2011 10:12:52 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id A2C20175DD; Fri, 11 Mar 2011 10:12:51 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Fri, 11 Mar 2011 10:12:51 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel/mercurial To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20110311101251.A2C20175DD@cvs.netbsd.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk Module Name: pkgsrc Committed By: wiz Date: Fri Mar 11 10:12:51 UTC 2011 Modified Files: pkgsrc/devel/mercurial: Makefile distinfo Log Message: Update to 1.8.1: This release backs out a behavior change for so-called 'fast-forward' merges on named branches. * annotate: rewrite to deal with crossed linkrevs (issue2682) * bookmark: fix invalidation of localrepo._bookmarkcurrent * cacert: improve error report when web.cacert file does not exist * contrib: update tcsh_completion for Mercurial 1.8 * hgcia: accept "queued." xmlrpc return as success * hgweb: fix filelog rss links generation * hgweb: use tip in gitweb/monoblue filelog rss links (issue2677) * merge: back out single-parent fast-forward merge * merge: drop resolve state for mergers with identical contents (issue2680) * merge: improve unresolved conflicts warning (issue2681) * mergetools: add alternate registry keys for 32bit apps on 64bit O/S * mq: forbid commit of merge involving mq patches * subrepo: backout 67fbe566eff1, --force requires svn >= 1.5 * subrepo: don't crash when git repo is missing * subrepo: handle svn tracked/unknown directory collisions * wix: drop bin/ folder from MSI installers (issue2673) To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/mercurial/Makefile cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/mercurial/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.