Branch: refs/heads/master Home: https://github.com/openSUSE/open-build-service Commit: b28e23ba9d0af2972e8861b14916adc98a6fd826 https://github.com/openSUSE/open-build-service/commit/b28e23ba9d0af2972e8861... Author: Adrian Schröter adrian@suse.de Date: 2014-10-30 (Thu, 30 Oct 2014)

Changed paths: M src/api/script/start_test_backend A src/api/test/fixtures/backend/source/kde4/kdelibs/kdelibs.changes A src/api/test/fixtures/backend/source/kde4/kdelibs/kdelibs.changes.branch A src/api/test/fixtures/backend/source/kde4/kdelibs/kdelibs.changes.merged A src/api/test/fixtures/backend/source/kde4/kdelibs/kdelibs.changes.new M src/api/test/functional/source_controller_test.rb A src/backend/bs_mergechanges M src/backend/bs_srcserver

Log Message: ----------- [backend] special support to merge SUSE style .changes files

This solves the problem of merge errors when upstream and branch apply changes at the same time.

A (so far wanted) side effect is that times get converted to UTC times