[PATCH 10 of 11] py3: prove that a second commit in a given repository works

Augie Fackler raf at durin42.com
Sun Mar 26 18:36:44 EDT 2017


# HG changeset patch
# User Augie Fackler <raf at durin42.com>
# Date 1490567422 14400
#      Sun Mar 26 18:30:22 2017 -0400
# Node ID c5ecedb198527765f465da499c37cc53fc38ea53
# Parent  386820bf1ae17e2fd7425164c091065a39d21193
py3: prove that a second commit in a given repository 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
@@ -132,21 +132,13 @@ Test bytes-ness of policy.policy with HG
   A iota
   $ $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
+  $ HGEDITOR='echo second commit > ' $PYTHON3 $HGBIN commit
   $ $PYTHON3 $HGBIN status
 
 Prove the repo is valid using the Python 2 `hg`:
@@ -155,11 +147,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:f8e239757efb
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     message
+  summary:     second commit
   
+  changeset:   0:71c96e924262
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     commit performed in Python 3
+  


More information about the Mercurial-devel mailing list