Description
We allow upgrades of 1.6 working copies with tree conflicts but none of the upgrade regression tests exercise the tree-conflict code. For a while we were putting tree-conflict data into the wrong column: see r1089142 and r1133329. Does the code work? upgrade_tests.py:upgrade_tc is for f20->f21 1.7-dev upgrades.