# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1520207227 18000
# Node ID ed46d48453e8c42b1674bf7dd48d02fd1ffe7505
# Parent  e2c0c0884b1fbbbca7b25be39a6ad7a319f8c660
py3: drop b'' from generate-working-copy-states.py output

I could make everything bytes, but decoding filename seemed easier and we
don't have to worry about non-ascii filenames here.

diff -r e2c0c0884b1f -r ed46d48453e8 contrib/python3-whitelist
--- a/contrib/python3-whitelist	Sun Mar 04 18:41:09 2018 -0500
+++ b/contrib/python3-whitelist	Sun Mar 04 18:47:07 2018 -0500
@@ -200,6 +200,7 @@
 test-merge-commit.t
 test-merge-criss-cross.t
 test-merge-default.t
+test-merge-force.t
 test-merge-internal-tools-pattern.t
 test-merge-local.t
 test-merge-remove.t
diff -r e2c0c0884b1f -r ed46d48453e8 tests/generate-working-copy-states.py
--- a/tests/generate-working-copy-states.py	Sun Mar 04 18:41:09 2018 -0500
+++ b/tests/generate-working-copy-states.py	Sun Mar 04 18:47:07 2018 -0500
@@ -66,7 +66,7 @@
 content = []
 for filename, states in combinations:
     if target == 'filelist':
-        print(filename)
+        print(filename.decode('ascii'))
     elif target == 'state':
         if depth == 'wc':
             # Make sure there is content so the file gets written and can be