# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2018-03-04 23:47:07
# 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 --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -200,6 +200,7 @@ test-merge-closedheads.t
 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 --git a/tests/generate-working-copy-states.py b/tests/generate-working-copy-states.py
--- a/tests/generate-working-copy-states.py
+++ b/tests/generate-working-copy-states.py
@@ -66,7 +66,7 @@ combinations = sorted(generatestates(max
 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