Committed revision 504 to http://bzr.xsteve.at/dvc/
Merged from Stephen Leake: xmtn-conflicts improvements
------------------------------------------------------------
revno: 477.1.16
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sun 2008-09-28 15:39:29 -0400
message:
merge from Stefan
------------------------------------------------------------
revno: 477.1.15
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sun 2008-09-28 15:32:07 -0400
message:
More xmtn-conflicts improvements.
* lisp/dvc-utils.el (dvc-ewoc-maybe-scroll): new
(dvc-make-ewoc-next): use it.
* lisp/xmtn-automate.el (xmtn--heads): move here from xmtn-dvc.el, to
share with xmtn-conflicts.el
* lisp/xmtn-basic-io.el (xmtn-basic-io-optional-line): new
* lisp/xmtn-conflicts.el (xmtn-conflicts-left-root)
(xmtn-conflicts-right-root, xmtn-conflicts-left-branch)
(xmtn-conflicts-right-branch, xmtn-conflicts-total-count)
(xmtn-conflicts-resolved-count): new buffer-local header vars.
(xmtn-conflicts-parse-header): handle no ancestor, set buffer-local
header vars.
(xmtn-conflicts-parse-duplicate_name)
(xmtn-conflicts-parse-content-conflict): track count of conflicts,
resolutions
(xmtn-conflicts-set-hf): new
(xmtn-conflicts-read): abort if no merge needed.
(xmtn-conflicts-write-content, xmtn-conflicts-write-duplicate_name):
track resolution count.
(xmtn-conflicts-save): update header.
(xmtn-conflicts-resolve-conflict-post-ediff): more clean up actions.
(xmtn-conflicts-resolve-content-ediff): store all files under
_MTN/resolutions. Use branch names in directories for better ediff
names.
(xmtn-conflicts-mode-map): add Update
(xmtn-conflicts-mode-menu): add Update
(xmtn-conflicts-review): check for no file.
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
