Committed revision 501 to http://bzr.xsteve.at/dvc/
Merged from Stephen Leake: Added menu entries for xmtn conflict handling
------------------------------------------------------------
revno: 477.1.14
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sat 2008-09-27 19:53:56 -0400
message:
merge from Stefan
------------------------------------------------------------
revno: 477.1.13
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sat 2008-09-27 19:49:25 -0400
message:
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'.
------------------------------------------------------------
revno: 477.1.12
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Thu 2008-09-25 05:03:19 -0400
message:
xmtn minor fixes
* lisp/xmtn-conflicts.el: better prompts
* lisp/xmtn-dvc.el: fix minor bugs
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
