Toby Allsopp <[EMAIL PROTECTED]> writes: > On Mon, Mar 31 2008, Xavier Maillard wrote: > >> Committed revision 383 to >> http://bazaar.launchpad.net/~toby-mi6/dvc/toby_allsopp >> >> dvc-bookmarks: Add a function to edit a bookmark. >> >> What's a bookmark in the DVC.el meaning ? > > See dvc-bookmarks.el for details. There is a command, M-x dvc-bookmarks > (C-x V b), that opens a *dvc-bookmarks* buffer into which you can put > the local repositories you use often (or just want to rememmber) and > then perform operations such as pull, push, merge, log, status, etc on > them, all from the bookmarks buffer. You can also define "partners" for > each repository, which are URLs of other repositories somehow related to > it, and then perform pull or merge using a partner rather than the > default. The bookmarks are saved in ~/.dvc/dvc-bookmarks.el. > > That's a pretty poor explanation, sorry. In the absence of good > documentation the source is your best bet for figuring out what it does. > > Toby. Hi, about pushing in in dvc-bookmarks, notice that with hg, it's not working if you don't add this line in .emacs: ,---- | (defalias 'xhg-dvc-push 'xhg-push) `---- I use that for some days now and it's working fine. May be that's should be added in source code (dvc-unified.el ?)
About merging from bookmarks with hg it's work with the hgmerge script, that's mean if hgmerge fail to merge, it' will call EDITOR to merge in one file, what is a dangerous exercice. You have to use the script that is on mercurial site to merge with ediff. I hope Stefan have receive my recipe since i have no news. -- A + Thierry Pub key: http://pgp.mit.edu _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
