Conflict in WiMAC system tests after upgrade

Created by Maciej Muehleisen on on 2010-01-26
Keywords:
conflict directory not empty

Upgrading to the latest versions can lead to conflicts:

Conflict: can't delete commonConfig because it is not empty. Not deleting.
Conflict: can't delete commonConfig/support because it is not empty. Not deleting.

in
tests/system/wifi-wimac-coexist-tests and /tests/system/wifi-wimac-coexist-tests

The reason is that compiled Python files (.pyc) might be present. Solution:

cd into the directory and execute "rm -rf commonConfig" then type "bzr resolve --all".