Hi Stephen! > Committed revision 183 to http://stephe-leake.org/dvc > > Factor out common code from xmtn--status-using-inventory (eventually from > other backends also) > > lisp/dvc-core.el : check result of dvc-kill-process-maybe > lisp/dvc-diff.el : improve doc string of dvc-buffer-search-file > lisp/dvc-status.el : bind dvc-log. Add dvc-status-prepare-buffer, > dvc-status-inventory-done > lisp/xmtn-dvc.el : in xmtn--status-using-inventory, use > dvc-status-prepare-buffer, dvc-status-inventory-done.
I would like to merge from your branch, but I encounter some conflicts: +N lisp/dvc-status.el M lisp/bzr-dvc.el M lisp/dvc-core.el M lisp/dvc-defs.el M lisp/dvc-diff.el M lisp/dvc-unified.el M lisp/tests/xmtn-tests.el M lisp/xdarcs-dvc.el M lisp/xhg-dvc.el M lisp/xmtn-dvc.el Text conflict in lisp/bzr-dvc.el Text conflict in lisp/dvc-diff.el Text conflict in lisp/tests/xmtn-tests.el Text conflict in lisp/xmtn-dvc.el 4 conflicts encountered. Could you please merge from my tree and resolve the conflicts. Additionally I'd like to know whats the status of dvc-status.el in your tree. Thanks, Stefan. _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
