Spike Spiegel <[email protected]> writes: > Hi, > > first of all a big thanks to everybody that has worked on dvc, it's a > great mode. I've been using it for some time now and only recently > tried to improve my workflow and eliminate the need to switch to a > terminal to run some commands. I primarily use mercurial for my work > so all references in this email are to hg. I have the following > questions/problems:
> * In bookmarks mode: > ** if I set up a partner and then hit M-f it will pull from the > partner and I don't seem able to ever pull from the configured path > (as returned by hg paths). On the other hand if I hit "s" for status > and in that screen run M-f it will pull form path 1) emacs-bookmark-extension-qp ==> work here and apply patchs to 2 2) emacs-bookmark-extension ==> push to 3 (similar to pulling from 4) 3) emacs-bookmark-extension-intox ==> pull from remote, push to remote. 4) Partner [Local hg repo] ==> pull from 2 > ** I don't see a way to run xhg-outgoing/see what I'm going to push, > even tho the function is clearly existing and I can run it manually (I > also don't see how I'd diff against a branch/revision) >From bookmarks you have to set manually the push destination with "A-m". > ** if I hit "d" for diff I get No definition and no fallback for > xhg-"dvc-diff-against-url" >From where are you hitting d? It work fine from bookmarks. > * branch support, at list listing, seems to be incomplete: No > definition and no fallback for xhg-"dvc-list-branches". running > hg-branches it does know what branches I have and is current. > dvc-select-branch seems to work. am I missing anything or is that not > implemented? ,----[ Howto Named Branchs Mercurial ] | - See all branches: | | Use `xhg-branches'. | | - Show the current branch: | | Use `xhg-branch' whithout argument. | | - Create a new branch: | | Use `xhg-branch' with a prefix arg. | | - Switch to another branch: | | Use `xhg-update' with two prefix arg. | | - Merge change of a branch in another branch: | | Use `xhg-merge-branch'. | | So typically, from the default branch, you create a dev branch: | | "C-u M-x xhg-branch RET" ==> revision number ==> RET ==> branch name RET. | | NOTE: revision number should be the last (you have completion on it). | | "M-x xhg-branch RET" ==> give you your new current branch name. | | NOTE: `xhg-branches' will show you your new branch only after first commit. | | Work on it (all commits go in this branch). | | When all the work is finish and stable on dev branch, | | switch to default branch: | | "C-u C-u M-x xhg-update RET" | | and merge the dev branch in default branch: | | "M-x xhg-merge-branch RET" | | You can maybe now tag the default branch with `xhg-tag'. (to see all tags `xhg-tags'). | | "M-x xhg-tag RET" | | You can now switch again to dev branch to keep developping your instable code. :-) | | "C-u C-u M-x xhg-update RET" `---- > * xhg-log (as ran with L from status screen) completely kills my emacs > (abort, coredump kind of thing), changelog works. If I set up a pager > like less for hg then I get a chance to kill the *xhg-log* buffer You can run xhg-log from bookmarks with "l".(xhg-log is linked to dvc-changelog). You can use different prefix arg with xhg-log: ,----[ C-h f xhg-log RET ] | xhg-log is an interactive compiled Lisp function in `xhg.el'. | | (xhg-log &optional R1 R2 SHOW-PATCH FILE) | | Run hg log. | When run interactively, the prefix argument decides, which parameters are queried from the user. | C-u : Show patches also, use all revisions | C-u C-u : Show patches also, ask for revisions | positive : Don't show patches, ask for revisions. | negative : Don't show patches, limit to n revisions. | | [back] | | ===*===*===*===*===*===*===*===*===*===*=== `---- > * with [change]log I don't see how to get it to output a patch While in log buffer hit "e" that is xhg-export. > * M-x xhg-incoming doesn't let me specify a branch or to show a patch > even tho looking at the .el at least the patch param is supported. And > what about -r? Don't know, i will have a look. > > I'm running emacs 23.1.50.1 and dvc snapshot. > > thanks for your input, > > Spike HTH -- Thierry Volpiatto _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
