search

peter-x / synclist

GNU General Public License v2.0
6 stars 0 forks source link

Do not merge while synchronizer is synchronizing #15

Closed peter-x closed 10 years ago

peter-x commented 10 years ago

When a new remote database with many items is added, they are transferred one by one and the manager should not merge until the transfer of all the items is complete.

peter-x commented 10 years ago

This can probably be avoided by simply transferring the items newst-first. Can this lead to merge-bases not being available?

peter-x commented 10 years ago

It seems that in addition to this problem, we do not get a deterministic merge.

peter-x commented 10 years ago

Investigation showed that at least for two simultaneous changes with depth one, the merge is deterministic. The base issue still needs to be solved, otherwise we do many unnecessary merges.