[darcs-users] Write-up on "tree repositories" as an alternative to conflictors

Ben Franksen ben.franksen at online.de
Wed Nov 25 11:53:24 UTC 2020


Two minor remarks.

> 4.2.7 Reactivating a patch
> As promised in Section 4.1.3, it is possible to re-activate a previously deactivated patch p. First, it is likely the user will need to de-activate patches p conflicts with, as well as patches that conflict with p’s dependencies if those are also being re-activated. Section 4.2.6 explains how to deactivate these patches and the patches that depend on them.

Obviously, dependencies of p /have/ to be reactivated along with p, so
the "if" is misleading here.

> • Insert p and its dependencies into the chosen resolution. We already have
> a copy of them somewhere: recall that a tree repository is a pair (T, C); T
> and C together contain all active and deactivated patches in the repository.
> Some commuting may be needed. (TODO: elabourate?)

Indeed this should be elaborated!

Cheers
Ben



More information about the darcs-users mailing list