[andreas@andylaptop ~]$ cd Projects/OpenLP/
[andreas@andylaptop OpenLP]$ rm -r trunk/
b[andreas@andylaptop OpenLP]$ bzr checkout lp:openlp trunk
[andreas@andylaptop OpenLP]$ cd trunk/
[andreas@andylaptop trunk]$ bzr merge lp:~trb143/openlp/tests_only
+N  tests/resources/serviceitem_image_2.osd
 M  openlp/core/lib/serviceitem.py
 M  openlp/core/lib/settings.py
 M  openlp/plugins/images/imageplugin.py
 M  tests/functional/__init__.py
 M  tests/functional/openlp_core_lib/test_image_manager.py
 M  tests/functional/openlp_core_lib/test_registry.py
 M  tests/functional/openlp_core_lib/test_screen.py
 M  tests/functional/openlp_core_lib/test_serviceitem.py
 M  tests/interfaces/__init__.py
 M  tests/interfaces/openlp_core_lib/test_pluginmanager.py
 M  tests/interfaces/openlp_core_ui/test_filerenamedialog.py
 M  tests/interfaces/openlp_core_ui/test_servicemanager.py
 M  tests/interfaces/openlp_core_ui/test_servicenotedialog.py
 M  tests/interfaces/openlp_core_ui/test_starttimedialog.py
R   tests/resources/serviceitem_custom1.osd => tests/resources/serviceitem_custom_1.osd
RM  tests/resources/serviceitem_image1.osd => tests/resources/serviceitem_image_1.osd
Alle Änderungen erfolgreich angewendet.
[andreas@andylaptop trunk]$ nosetests2 tests/functional/
...............................................Speicherzugriffsfehler (Speicherabzug geschrieben)
[andreas@andylaptop trunk]$