start
Table of Contents

Merging and updating

This are just some thoughts and notes about merging

Current problem

Currently (2006-08) we have several implementations of merging code in Pootle and the toolkit that do similar things. pot2po, pomerge, pootlefile.py::mergefile (used with file upload in Pootle), projects.py::updatepofile (used for cvs update)

For pootle issues, see upload_and_download_merging_policy.

Status quo

pot2po

pomerge

pootlefile::mergefile

(used for file upload)

projects.py::updatepofile

(used for updating from version control) Three files are involved: the current local file, the original file from VCS and the new file from VCS.

Solution

We want to abstract it all to have one code base, where new features can be shared by all users, etc. The merging can be custimised by parameters or a configuration.

Parameters

Sanity checks

The following sanity checks are basic things to check in addition to the complex issues described above.