From patchwork Sun Mar 26 11:59:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [7,of,7] py3: prove second commit works From: Yuya Nishihara X-Patchwork-Id: 19684 Message-Id: To: mercurial-devel@mercurial-scm.org Date: Sun, 26 Mar 2017 20:59:50 +0900 # HG changeset patch # User Yuya Nishihara # Date 1490523101 -32400 # Sun Mar 26 19:11:41 2017 +0900 # Node ID f7e37b9f1d231c1f9da91df7091040e44f33bba5 # Parent c00753c42a0b04dc72ed831a87945f1eb41c84c1 py3: prove second commit works Finally it works. diff --git a/tests/test-check-py3-commands.t b/tests/test-check-py3-commands.t --- a/tests/test-check-py3-commands.t +++ b/tests/test-check-py3-commands.t @@ -133,19 +133,12 @@ Test bytes-ness of policy.policy with HG $ $PYTHON3 $HGBIN commit --message 'commit performed in Python 3' $ $PYTHON3 $HGBIN status -TODO: bdiff is broken on Python 3 so we can't do a second commit yet, -when that works remove this rollback command. - $ hg rollback - repository tip rolled back to revision -1 (undo commit) - working directory now based on revision -1 - $ mkdir A $ echo "This is the file 'mu'." > A/mu $ $PYTHON3 $HGBIN addremove adding A/mu $ $PYTHON3 $HGBIN status A A/mu - A iota $ HGEDITOR='echo message > ' $PYTHON3 $HGBIN commit $ $PYTHON3 $HGBIN status @@ -155,11 +148,16 @@ Prove the repo is valid using the Python checking manifests crosschecking files in changesets and manifests checking files - 2 files, 1 changesets, 2 total revisions + 2 files, 2 changesets, 2 total revisions $ hg log - changeset: 0:e825505ba339 + changeset: 1:e1e9167203d4 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: message + changeset: 0:71c96e924262 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: commit performed in Python 3 +