Committed revision 540 to http://stephe-leake.org/dvc
xmtn conflicts, propagate improvements
* lisp/dvc-diff.el (dvc-dvc-file-diff): use correct dvc
* lisp/dvc-status.el (dvc-status-dtrt): do ediff on renames; same as modified.
* lisp/xmtn-automate.el (xmtn-automate-terminate-processes-in-root):
improve tracing of session caching.
* lisp/xmtn-base.el (xmtn--filter-non-dir): new
* lisp/xmtn-conflicts.el (xmtn-conflicts-write-header): don't write out
ancestor id if there isn't one.
(xmtn-conflicts-resolve-user): add default-side
(xmtn-conflicts-resolve-map): use it
(xmtn-conflicts-do-propagate): allow caching the branch
(xmtn-conflicts-mode-menu): add xmtn-conflicts-ediff-resolution-ws
(xmtn-conflicts-save-opts): allow caching branches.
(xmtn-conflicts-1): don't need xmtn-dvc-log-clean
(xmtn-check-workspace-for-propagate): allow caching branch
(xmtn-conflicts-propagate): cache branches
(xmtn-conflicts-clean): add message.
* lisp/xmtn-dvc.el: delete xmtn-dvc-log-clean
(xmtn--do-update): add post-update-p; allow calling update from a
higher level
(xmtn--update): add check-id-p, no-ding; allow calling update from a
higher level
(xmtn-dvc-update): add no-ding
(xmtn-propagate-from): add cached-branch
(xmtn-dvc-merge-1): split out from xmtn-dvc-merge
* lisp/xmtn-ids.el (xmtn--get-parent-revision-hash-id): simplify
(xmtn--resolve--previous-revision): cache branch
* lisp/xmtn-propagate.el: make some vars permanent-local. add branch
display names, cache branches. General improvements.
* lisp/xmtn-revlist.el (xmtn-revlist-show-conflicts): set workspace dirs
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
