all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Kai Grossjohann <kai.grossjohann@gmail.com>
To: help-gnu-emacs@gnu.org
Subject: How to merge from branch with vc-svn?
Date: Sat, 12 Oct 2013 13:55:18 -0700 (PDT)	[thread overview]
Message-ID: <9d98da6c-d990-4d65-a0f2-05ae5207ab79@googlegroups.com> (raw)

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


                 reply	other threads:[~2013-10-12 20:55 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9d98da6c-d990-4d65-a0f2-05ae5207ab79@googlegroups.com \
    --to=kai.grossjohann@gmail.com \
    --cc=help-gnu-emacs@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.