Michael Olson <[EMAIL PROTECTED]> writes: > Stephen Leake <[EMAIL PROTECTED]> writes: > >>> 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. > > The last change I see is "184: add working commit to dvc-status-add". > Maybe you forgot to run "bzr commit" after the merge?
Apparently something screwed up in my web push process. I'm using wwwsync.pl; I think I confused it when I also published dvc-fileinfo. Anyway, I've deleted my web copy, and created a fresh one. Then to double check, I pulled from there to a separate area. It reports: [EMAIL PROTECTED] bzr log --line 189: stephe 2007-08-12 merge from Stefan 188: stephe 2007-08-12 Move dvc-status-mode to branch dvc-fileinfo; revert x... 187: stephe 2007-08-12 merge from http://bzr.xsteve.at/dvc/ 186: stephe 2007-08-07 * lisp/core.el: 185: stephe 2007-07-21 patched lisp/dvc-status.el 184: stephe 2007-07-15 add working commit to dvc-status-add So please try again. -- -- Stephe _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
