Committed revision 486 to http://stephe-leake.org/dvc
xmtn-conflicts handle duplicate_name, misc fixes
* lisp/dvc-revlist.el (dvc-revlist-mode-map, dvc-revlist-mode-menu): Add
update to head, show missing.
* lisp/xmtn-conflicts.el: handle duplicate_name conflicts
(xmtn-conflicts-clear-resolution): new.
(xmtn-conflicts-resolve-map): keyboard menu; prompt for appropriate
resolutions
(xmtn-conflicts-clean): fix bugs.
* lisp/xmtn-dvc.el (xmtn--status-header): fix faces in header string;
don't need princ.
(xmtn--refresh-status-header): handle different names for the ewoc in
different modes.
(xmtn--add-patterns-to-mtnignore): sort lines.
(xmtn--do-remove): return t.
* lisp/xmtn-revlist.el (xmtn-revlist-mode-map, xmtn-revlist-mode-menu):
add conflicts clean
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
