Mercurial > hg

changeset 39429:7450f6500b6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: write the file in str mode in tests/test-rename-merge2.t This is better then converting the value the value of sys.argv to bytes. This makes the test pass on Python 3. Differential Revision: https://phab.mercurial-scm.org/D4457
author Pulkit Goyal <pulkit@yandex-team.ru>
date Tue, 04 Sep 2018 17:33:22 +0300
parents cbfab495dbcf
children c3491d3f8984
files tests/test-rename-merge2.t
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-rename-merge2.t	Tue Sep 04 17:32:09 2018 +0300
+++ b/tests/test-rename-merge2.t	Tue Sep 04 17:33:22 2018 +0300
@@ -3,7 +3,7 @@
   $ cd t
   $ cat <<EOF > merge
   > import sys, os
-  > f = open(sys.argv[1], "wb")
+  > f = open(sys.argv[1], "w")
   > f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3]))
   > f.close()
   > EOF