Am Donnerstag, 29. Januar 2009 12:58:24 schrieb Hans Petter Jansson:
On Tue, 2009-01-27 at 03:11 +0100, Vincent Untz wrote:
So, please, think about the pain that people feel when they have to handle those manual merges, and use the devel projects.
I think I asked before if the build service is moving to a more capable VCS backend (for handling merges) in the long term. If we were to use git, for instance, and expose its - or part of its - functionality directly, we'd get less error-prone merges, a UI that many developers are already familiar with, and the possibility to maintain branches even outside the build service (or across build services).
I suspect it would save us a lot of pain. OTOH, I haven't surveyed the openSUSE developers or anything - maybe I'm the only one who thinks it could be solved this way :)
Again: It is way more effort to extend git/svn/.. to our needs than to add merge handling to osc. We would not have anything this year with this approach.
Yes, we lack merge handling atm. But when we had no time for this it does not help to start an approach which would take way more time.