Committed revision 537 to http://bzr.xsteve.at/dvc/
Merged a bunch of xmtn improvements from Stephen Leake
------------------------------------------------------------
revno: 477.1.27
committer: stephe <ste...@gsod000850872l>
branch nick: dvc
timestamp: Sun 2009-03-15 10:23:46 -0400
message:
* lisp/xmtn-run.el: allow "dev" in mtn version string
------------------------------------------------------------
revno: 477.1.26
committer: stephe <ste...@gsod000850872l>
branch nick: dvc
timestamp: Sun 2009-03-15 10:09:56 -0400
message:
merge from Stefan
------------------------------------------------------------
revno: 477.1.25
committer: stephe <ste...@gsod000850872l>
branch nick: dvc
timestamp: Sun 2009-03-15 10:07:09 -0400
message:
* lisp/xmtn-conflicts.el: improve
------------------------------------------------------------
revno: 477.1.24
committer: stephe <ste...@gsod000850872l>
branch nick: dvc
timestamp: Fri 2009-01-09 12:12:52 -0500
message:
merge from Stefan
------------------------------------------------------------
revno: 477.1.23
committer: stephe <ste...@gsod000850872l>
branch nick: dvc
timestamp: Fri 2009-01-09 11:43:44 -0500
message:
improve support for xmtn conflict resolution. make dvc-delta interactive.
* lisp/dvc-diff.el (dvc-file-ediff): disable local variables.
* lisp/dvc-log.el (dvc-ediff-setup): new.
* lisp/dvc-unified.el (dvc-delta): make interactive, allow back-end
specific revision specifier strings.
(dvc-log-edit): support conflicts buffers.
* lisp/xmtn-conflicts.el: improve support for conflicts resolution.
* lisp/xmtn-dvc.el (xmtn-dvc-log-message): new
(xmtn-dvc-log-clean): new
(xmtn-dvc-log-edit-done): use them
(xmtn-dvc-delta): support selectors
(xmtn-propagate-from): support log message.
------------------------------------------------------------
revno: 477.1.22
committer: Stephe <ste...@lm000850872>
branch nick: dvc
timestamp: Fri 2008-10-10 14:42:28 -0400
message:
merge from Stefan
------------------------------------------------------------
revno: 477.1.21
committer: Stephe <ste...@lm000850872>
branch nick: dvc
timestamp: Fri 2008-10-10 14:41:07 -0400
message:
improve xmtn-conflicts; dvc-merge use them.
* lisp/xmtn-automate.el (xmtn--tree-default-branch): move here from
xmtn-dvc, to share with xmtn-conflicts
* lisp/xmtn-conflicts.el (xmtn-conflicts-left-work): new variable
(xmtn-conflicts-parse-header): store branch in dvc-conflicts-opts file
(xmtn-conflicts-save-opts, xmtn-conflicts-load-opts): new
(xmtn-conflicts-merge): always use merge heads.
* lisp/xmtn-dvc.el (xmtn-dvc-merge): use conflicts file if present.
------------------------------------------------------------
revno: 477.1.20
committer: Stephe <ste...@lm000850872>
branch nick: dvc
timestamp: Sat 2008-10-04 13:09:35 -0400
message:
More xmtn conflicts stuff.
* lisp/xmtn-automate.el (xmtn-automate-with-session,
xmtn-automate-simple-command-output-lines): add doc string.
* lisp/xmtn-basic-io.el (xmtn-basic-io-eof): new.
* lisp/xmtn-conflicts.el (xmtn-conflicts-parse-header): handle multiple
branch certs.
* lisp/xmtn-dvc.el (xmtn-diff-mode-map): Remap conflicts operations.
(xmtn-propagate-from): output 'done'.
* lisp/xmtn-ids.el (xmtn--branches-of): new.
------------------------------------------------------------
revno: 477.1.19
committer: Stephe <ste...@lm000850872>
branch nick: dvc
timestamp: Thu 2008-10-02 05:24:28 -0400
message:
Merge from Stefan.
* lisp/bzr.el (bzr-export-via-email): fix free variable
extra-parameter-list
------------------------------------------------------------
revno: 477.1.18
committer: Stephe <ste...@lm000850872>
branch nick: dvc
timestamp: Thu 2008-10-02 05:17:39 -0400
message:
xmtn-conflicts keybinding improvements.
* lisp/dvc-ui.el (menu): add dvc-missing
* lisp/xmtn-revlist.el (xmtn-revlist-mode-map): redesign key bindings.
(xmtn-revlist-mode-menu): Add show merge conflicts.
------------------------------------------------------------
revno: 477.1.17
committer: Stephe <ste...@lm000850872>
branch nick: dvc
timestamp: Tue 2008-09-30 11:21:00 -0400
message:
More xmtn conflicts improvements.
* lisp/dvc-buffers.el (dvc-revert-some-buffers): preserve mode on
revert-buffer; needed for log-edit, conflicts
* lisp/xmtn-conflicts.el (xmtn-conflicts-read): Don't abort on no
conflicts.
(xmtn-conflicts-resolve-content-file): new
(xmtn-conflicts-resolve-duplicate_name-ediff): restore window
configuration
(xmtn-conflicts-resolve-map): add clear, content file choices
(xmtn-conflicts-dtrt): add fixme; currently broken
(xmtn-conflicts-1): use 'conflicts store'
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
