Vincent LADEUIL <[EMAIL PROTECTED]> writes: > But.... I just did 'baz update' in my work dir 'dvc.stefan' and > now all my modifications are inside .rej files :(
Normal. baz update does undo (and save the changeset) replay the remote patches redo (reapply the changeset from undo) So, any of your changes that conflict with Stefan's conflict at the timg of the "redo". If you want CVS like markers, use "baz merge" (with no argument), and then, smerge-mode in Emacs is your friend. "baz resolved" when finished. > Also, it looks like http://test.bzr.free.fr/branches/dvc/ is not > up-to-date either :-( Should be fixed. > - A mental note to *always* run configure/make when I get a new > version and to leave/enter emacs and do three 'M-x dvc-reload' > (just kidding on the 3 :) when changing. M-x dvc-reload should rerun make for you, which in turn should re-run configure as necessary. Also, C-u M-x dvc-reload RET ~/path/to/dvc RET to change the version of DVC you are using. -- Matthieu
