Committed revision 490 to http://stephe-leake.org/dvc
Add xmtn conflicts commands to all appropriate menus. add xmtn-conflicts-dtrt,
xmtn-conflicts-do-merge
* lisp/dvc-buffers.el (dvc-buffer-type-alist): alphabetize, add 'conflicts'
* lisp/xmtn-automate.el (xmtn--map-parsed-certs,
xmtn--list-parsed-certs): move here from xmtn-dvc, so xmtn-conflicts
can use them
* lisp/xmtn-conflicts.el (xmtn-conflicts-check-mtn-version): new
(xmtn-conflicts-dtrt): new
(xmtn-conflicts-do-propagate): new
(xmtn-conflicts-mode-map): add xmtn-conflicts-dtrt,
xmtn-conflicts-do-merge
* lisp/xmtn-dvc.el (xmtn--refresh-status-header): only refresh status buffers.
(xmtn-diff-mode-map, xmtn-diff-mode-menu): add conflicts commands
(xmtn-propagate-from): check mtn version if resolve-conflicts.
* lisp/xmtn-revlist.el (xmtn-revlist-mode-map, xmtn-revlist-mode-menu):
add conflicts commands.
* lisp/xmtn-run.el (xmtn--minimum-required-command-version): change to
const, so can override with `let'.
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
