* How to merge from branch with vc-svn?
@ 2013-10-12 20:55 Kai Grossjohann
0 siblings, 0 replies; only message in thread
From: Kai Grossjohann @ 2013-10-12 20:55 UTC (permalink / raw)
To: help-gnu-emacs
I work on two branches in an svn repo. I opened a vc-dir buffer looking at the production branch. I typed C-x v m to invoke merge, then entered ^/branches/development at the "from revision" prompt, then kept the default "." response to the "to revision" prompt.
But that wasn't the right thing to do it seems. What should I have done instead?
(I wanted to execute the equivalent of the command line "svn merge ^/branches/development" in the production branch working copy. In fact, I will now go and do it from the command line.)
Thanks,
Kai
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-10-12 20:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-12 20:55 How to merge from branch with vc-svn? Kai Grossjohann
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.