Review: Needs Fixing Before we look at the actual fixes, there is a few things you need to fix to reduce the "noise" in the diff. Right now it is not possible to see what you've actually changed.
First you've added some new files in the openlp folder: openlp/.bzrignore openlp/MANIFEST.in openlp/README.txt openlp/copyright.txt openlp/openlp.py openlp/setup.cfg openlp/setup.py These seems to be copies of the ones in the root folder? Please remove them. Looking at the diff you seem to have replaced openlp/core/ui/slidecontroller.py entirely. This is probably due to your editor changing the indent-type (use spaces, not tabs), or your editor chaning line-endings-type (use unix style, not windows style). There is some conflicts in openlp/plugins/songs/lib/songstab.py and openlp/plugins/remotes/lib/remotetab.py. Please merge the recent changes from trunk and resolve the conflicts as described here: http://wiki.openlp.org/Development_Workflow#Merging It looks like you copied tests/interfaces/openlp_core_ui/test_slidecontroller.py from tests/functional/openlp_core_ui/test_slidecontroller.py? If they are the same just remove the new one. If not, then please remove all the duplicated code. Please fix the issues above and resubmit your merge proposal. And lastly, you don't have to repeat the long message at each commit, just use fairly short descriptions of what was changes since last the commit. You can use the long description when you submit a merge proposal here on launchpad. -- https://code.launchpad.net/~suutari-olli/openlp/bugs-1294111-1497637-escape-fixes-new/+merge/274089 Your team OpenLP Core is subscribed to branch lp:openlp. _______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : [email protected] Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
