Committed revision 482 to http://stephe-leake.org/dvc
xmtn-conflicts: add resolution.
* lisp/dvc-diff.el (dvc-diff-unmark-file): Simplify call to dvc-fileinfo-next.
* lisp/dvc-utils.el (dvc-make-ewoc-next): new.
(dvc-make-ewoc-prev): new.
* lisp/xmtn-conflicts.el (xmtn-conflicts-current-conflict-buffer): new
(xmtn-conflicts-ediff-quit-info): new.
(xmtn-conflicts-parse-content-conflict): check for "file" file-type.
(xmtn-conflicts-after-insert-file): Move more functionality here.
(xmtn-conflicts-write-header): improve handling of blank lines.
(xmtn-conflicts-write-content): ditto.
(xmtn-conflicts-resolvedp): new.
(xmtn-conflicts-next-unresolved): new
(xmtn-conflicts-prev-unresolved): new
(xmtn-conflicts-resolve-conflict-post-ediff): new.
(xmtn-conflicts-resolve-content): new
(xmtn-conflicts-resolve-conflict): new.
(xmtn-conflicts-mode-map): Define some keys.
(xmtn-conflicts-mode-menu): Define some menu entries.
(xmtn-conflicts-mode): fix local variable stuff.
(xmtn-conflicts): Change to require workspace, other revision, canonical
conflicts file.
(xmtn-conflicts-review): Change to require workspace, use canonical
workspace file.
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
