2011-10-13 | Paul Boddie | raw annotate files changeset graph | Added support for merging competing edits, opening the editor on a page where already approved changes conflict with competing queued changes. Changed the directives removal function to return directive values so that the parent revision can be obtained and used to retrieve the target page's body for that revision. |
1 Consider the approval workflow. Reverting the subpage to the desired version and 2 then invoking an approval action could propagate the queued version, but other 3 queued versions may need to be inspected later. Perhaps permit control over 4 whether earlier entries than the selected version can be purged, and whether the 5 subpage should be deleted upon approval.