On Monday 03 September 2007 16:51:14 wrote Klaas Freitag:
On Monday 03 September 2007 10:51, Adrian Schröter wrote:
Do you have any opinion how the actual merge should be done ?
Puh - to be honest, I need some input here. From my feeling I doubt that it is possible to do that completely automagically. And I wonder if that is needed - I think that no maintainer will trust an automatic change of his package.
Will it happen in the backend like it happens already when you have source linked + patched packages ?
I have to check that, any opinions on that?
Well, an automatic/backend merge is possible if the patches do apply. But the nice thing is that you can see this before, because otherwise the source preparation during build will fail also.
So we can either say
1) submit fixed source changes which do apply 2) request backend to do the merge.
A problem appears when the original project/package owner wants to merge, but the source do not apply currently (for example, because the same person merged another change right before).
In that case, the target project owner would need to fix the source before (what he may wants to do), but that means that he needs either to write it into requester project (bad idea, and he even has most likely no permission for it) or he needs to copy the project before. This is IMHO a serious possibility, if our tools make this easy.