Stephen Leake <[EMAIL PROTECTED]> writes: > Stefan Reichör <[EMAIL PROTECTED]> writes: > >> Stephen Leake <[EMAIL PROTECTED]> writes: >> >>> Stephen Leake <[EMAIL PROTECTED]> writes: >>> >>>> I'll work on pushing my bzr repository to my website, rather than post >>>> the patch here. >>> >>> Try http://stephe-leake.org/dvc >>> >>> That server supports http and ftp, but not sftp. >>> >>> The change for quoting shell arguments is revision 156. >> >> I run bzr merge http://stephe-leake.org/dvc and got the following output: >> >> M lisp/dvc-diff.el >> A lisp/dvc-diff.el >> M lisp/bzr.el >> M lisp/dvc-core.el >> M lisp/dvc-unified.el >> >> .... >> >> lisp/dvc-diff.el seems to be removed and readded. >> Has anyone a clue, how this can happen with bzr? > > I don't have an actual explanation, but something weird happened > when I tried to merge a recent update from http://bzr.xsteve.at/dvc/ > > bzr did seem to report that I had deleted dvc-diff.el, so I had to add > it back.
Ah, that explains the behaviour that I see. > I had some changes in dvc-diff.el at the time, and was confused about > the proper process. > > I was using DVC (or trying to). I think I ended up using some command > line operations. > > Next time I'll try to take better notes; I'm a little more confident > about what's going on now. The solution that I see is, that you branch again from my repository and apply your patches again. You can apply the changes with M-x ediff-directories. Stefan. _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
