Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
| C | CL | SC | CM |
---|
File | UM | SM | UM | SM | UM | SM |
---|
/spambayes/message.py | 4 | 3 | 49 | 29 | -- | 0 | SM |
/spambayes/Options.py | 6 | 0 | 24 | 0 | -- | 1 | SM |
/spambayes/ImapUI.py | 3 | 1 | 58 | 43 | -- | 0 | SM |
/spambayes/Version.py | 4 | 0 | 32 | 0 | -- | 1 | SM |
/scripts/sb_upload.py | 2 | 1 | 21 | 11 | -- | 0 | SM |
/spambayes/test/test_sb_dbexpimp.py | 1 | 0 | 376 | 0 | -- | 0 | SM |
/spambayes/test/test_sb_filter.py | 1 | 0 | 294 | 0 | -- | 0 | SM |
/contrib/tte.py | 1 | 0 | 17 | 0 | -- | 0 | SM |
/spambayes/__init__.py | 1 | 0 | 7 | 0 | -- | 1 | SM |
/spambayes/storage.py | 1 | 1 | 34 | 30 | -- | 0 | SM |
/scripts/sb_server.py | 1 | 1 | 33 | 23 | -- | 0 | SM |
/windows/pop3proxy_tray.py | 1 | 1 | 18 | 3 | -- | 0 | SM |
/spambayes/test/test_storage.py | 1 | 1 | 7 | 7 | -- | 0 | SM |
/spambayes/ProxyUI.py | 0 | 1 | 0 | 61 | -- | 0 | UM |
/spambayes/test/test_sb_server.py | 1 | 3 | 583 | 197 | -- | 0 | UM |
/spambayes/classifier.py | 2 | 4 | 38 | 30 | -- | 0 | UM |
/spambayes/test/test_message.py | 1 | 7 | 1159 | 145 | -- | 0 | UM |
/scripts/sb_imapfilter.py | 10 | 12 | 278 | 113 | -- | 0 | UM |