Committed revision 483 to http://stephe-leake.org/dvc
mtn conflict resolution: Add better top-level interface, improve operation.
Basically functional.
* lisp/xmtn-automate.el (xmtn-automate--append-encoded-strings): Allow
nil in list of strings.
* lisp/xmtn-basic-io.el (xmtn-basic-io-parse-line,
xmtn-basic-io-check-line, xmtn-basic-io-check-empty): move here from
xmtn-conflicts.el
* lisp/xmtn-conflicts.el (xmtn-conflicts-parse-content-conflict): fix small
bug.
(xmtn-conflicts-save): Replace region, don't just add to it.
(xmtn-conflicts-resolve-conflict-post-ediff): Clean up stuff.
(xmtn-conflicts-resolve-content-ediff): new.
(xmtn-conflicts-resolve-content-file): new.
(xmtn-check-workspace-for-propagate): new
(xmtn-conflicts-propagate): new
(xmtn-conflicts-merge): new
(xmtn-conflicts-clean): new.
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
