Committed revision 498 to http://bzr.xsteve.at/dvc/
Merged from Stephen Leake: Work on the xmtn conflict handling
------------------------------------------------------------
revno: 477.1.11
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Wed 2008-09-24 07:07:33 -0400
message:
merge from Stefan
------------------------------------------------------------
revno: 477.1.10
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Wed 2008-09-24 07:00:02 -0400
message:
* lisp/xmtn-conflicts.el: use dired-delete-file from Emacs 22
------------------------------------------------------------
revno: 477.1.9
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Wed 2008-09-24 06:43:25 -0400
message:
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
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
