On Thu, 29 Jan 2009, Hans Petter Jansson wrote:
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.
Oh, no doubt, that the current process doesn't exist and hence sucks :-)
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?
No idea, unfortunately. I've never looked at the code of ocs. But what basically needs to happen is to checkout the "new" package somewhere temporary, compare it file for file with your current copy, and for non-equal text files, replace your copy with the merge(1) file resulting from that new file, your base file and your changed file.
I.e. for simple text files (when you don't want to implement some better merge algorithm than merge(1)) it should be a rather simple task.