Plan 9 from Bell Labs’s /usr/web/sources/patch/applied/replica-c-resolve/readme

Copyright © 2021 Plan 9 Foundation.
Distributed under the MIT License.
Download the Plan 9 distribution.


When a conflict is being resolved using local copy replica/applylog -c should save the resolution to the database, but some code paths just skips over.

In the past, the workaround was to give all -c/-s to the pull script at once so log apply time is updated and the entries are never revisited. However, this stopped to work when plan9.log began to be recreated monthly, and the earlier-resolved conflicts were reported again and again.

This patch solves the problem for 'a' and 'c' verbs in the log.

Bell Labs OSI certified Powered by Plan 9

(Return to Plan 9 Home Page)

Copyright © 2021 Plan 9 Foundation. All Rights Reserved.
Comments to [email protected].