Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1604932995144450"
MIME-Version: 1.0
Date: Mon, 9 Nov 2020 14:43:15 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/devel/py-hg-evolve
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20201109144315.0F4F3FB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1604932995144450
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Mon Nov  9 14:43:14 UTC 2020

Modified Files:
	pkgsrc/devel/py-hg-evolve: Makefile distinfo

Log Message:
py-hg-evolve: update to 10.1.0.

10.1.0 -- 2020-10-31
--------------------

  * compatibility with Mercurial 5.6

  * numerous minor changes to packaging, Makefile, README moved to README.rst

  * evolve: various improvements to content-divergence resolution
  * evolve: fix various issues with --continue when solving content-divergence
  * evolve: specify the source of config override for `server.bundle1=no`
  * evolve: avoid leaving mergestate after instability resolution
  * evolve: while resolving conflicts, the evolved node will no longer be a
    dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`,
    but it will show up as `%` with hg >= 5.4)

  * metaedit: update bookmark location when applicable

  * rewind: add a --dry-run flag
  * rewind: properly record rewind of splits as folds

topic (0.20.0)

  * stack: support foo#stack relation revset (hg-5.4+ only)
  * merge: add a experimental.topic.linear-merge option to allow oedipus merges
    in some cases


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-hg-evolve/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-hg-evolve/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1604932995144450
Content-Disposition: inline
Content-Length: 2650
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/py-hg-evolve/Makefile
diff -u pkgsrc/devel/py-hg-evolve/Makefile:1.14 pkgsrc/devel/py-hg-evolve/Makefile:1.15
--- pkgsrc/devel/py-hg-evolve/Makefile:1.14	Tue Oct  6 17:52:16 2020
+++ pkgsrc/devel/py-hg-evolve/Makefile	Mon Nov  9 14:43:14 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2020/10/06 17:52:16 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/09 14:43:14 wiz Exp $
 
-DISTNAME=	hg-evolve-10.0.2
+DISTNAME=	hg-evolve-10.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel scm
 MASTER_SITES=	${MASTER_SITE_PYPI:=h/hg-evolve/}
@@ -20,16 +20,11 @@ post-install:
 	rm -f ${DESTDIR}${PREFIX}/${PYSITELIB}/hgext3rd/__init__.py*
 	rm -f ${DESTDIR}${PREFIX}/${PYSITELIB}/hgext3rd/__pycache__/__init__.*
 
-# Test status
-# as of 10.0.2 with mercurial 5.5.2
-# Ran 187 tests, 4 skipped, 7 failed.
-# test-evolve-phase-divergence.t
-# test-check-compat-strings.t
-# test-evolve.t
-# test-evolve-public-content-divergent-corner-cases.t
-# test-evolve-public-content-divergent-discard.t
-# test-evolve-public-content-divergent-main.t
-# test-unstability-resolution-result.t
+# Test status as of 10.1.0 with mercurial 5.6:
+# Failed test-check-compat-strings.t: output changed
+# Failed test-check-debian.t: output changed
+# Failed test-evolve-content-divergent-case-A2.t: output changed
+# Ran 194 tests, 4 skipped, 3 failed.
 
 .if 0
 HG_WRKSRC=	cd ../py-mercurial && ${MAKE} show-var VARNAME=WRKSRC

Index: pkgsrc/devel/py-hg-evolve/distinfo
diff -u pkgsrc/devel/py-hg-evolve/distinfo:1.8 pkgsrc/devel/py-hg-evolve/distinfo:1.9
--- pkgsrc/devel/py-hg-evolve/distinfo:1.8	Sun Sep 13 11:05:01 2020
+++ pkgsrc/devel/py-hg-evolve/distinfo	Mon Nov  9 14:43:14 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2020/09/13 11:05:01 wiz Exp $
+$NetBSD: distinfo,v 1.9 2020/11/09 14:43:14 wiz Exp $
 
-SHA1 (hg-evolve-10.0.2.tar.gz) = 296bec199a6bbbc9dc28b0fb499360bf229dff99
-RMD160 (hg-evolve-10.0.2.tar.gz) = a892bf774d42866ebcfa27e9fab627fd280f3c21
-SHA512 (hg-evolve-10.0.2.tar.gz) = 9250c5d46a6b3263e9d09f6ca72a912887c793ec4d2f7c9440aa07058f2706a28f2d78352b9c91d20bbd4d8fd4abf2e21d92d72f32faf046d6b8ff2dc2f6d15f
-Size (hg-evolve-10.0.2.tar.gz) = 809860 bytes
+SHA1 (hg-evolve-10.1.0.tar.gz) = d298034d89e52181f8dd73961334df62596902e2
+RMD160 (hg-evolve-10.1.0.tar.gz) = 1edda6cd7155641aa79f3a9d1f92ecc731b7a60c
+SHA512 (hg-evolve-10.1.0.tar.gz) = 26333db8f71a6116ce9d8cbb21940befa573c1bbba3361af4776b4b2d3a3eca33b2c01ab5b5c9dc95810fb89f1e84b2ad85bf0a48989f5c583ebfca922d7d4da
+Size (hg-evolve-10.1.0.tar.gz) = 836446 bytes
 SHA1 (patch-hgext3rd_evolve_obsexchange.py) = 12058a8f27c63b259dcc0ffaf77febafcdeeba46


--_----------=_1604932995144450--