On Thu, 2009-01-29 at 13:48 +0100, Michael Matz wrote:
On Thu, 29 Jan 2009, Hans Petter Jansson wrote:
I think I asked before if the build service is moving to a more capable VCS backend (for handling merges) in the long term.
AFAIU the pain is in merging text files, right? (In comparison to somehow magically merging conflicting tarballs) In that case you don't need any fancy VCS to help with this. In fact most VCS simply use merge(1) or an internal variant of it, the conventional three way merge.
I don't think it's that usual for tarballs to conflict; the version tends to be in the file name (at least for packages maintained upstream), and the tarball itself is canonical and should produce the same checksum on both branches. So I think a solution for text files would suffice. No, you don't need a fancy VCS, but most existing DVCSes have pleasant interfaces for merging, compared to having to check out the _link and (sometimes multiple) project.diff files, and applying those. The last time I had to do this, most of the projects didn't have any actual conflicts either - just divergent histories.
It's only this part that is missing from the tools (e.g. ocs), so someone should perhaps simply implement it.
Do you know how much work it's estimated to take? -- Hans Petter -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org