Stefan Reichör <[EMAIL PROTECTED]> writes: > 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.
Hmm. I got those conflicts when I merged from your branch this morning, but I thought I had resolved them. I guess I missed a step somewhere. Or maybe you caught my web site in the middle of an update? I've now done another pull/merge/commit/push cycle; it should be cleared up. > Additionally I'd like to know whats the status of dvc-status.el in > your tree. dvc-status.el should not exist in http://stephe-leake.org/dvc/lisp/, only in http://stephe-leake.org/dvc-fileinfo/lisp/ I haven't had much chance to work on it in the last few weeks; I've moved to a new apartment, and I've been helping fix bugs in monotone. But I'm getting back to it now. My plan is to split out the new ewoc structure into dvc-fileinfo.el, and use it in dvc-status.el and dvc-diff.el, and the associated back-end code. I created the dvc-fileinfo branch because dvc-diff will be broken while I work on it. -- -- Stephe _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
