all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Chong Yidong <cyd@stupidchicken.com>
To: emacs-devel@gnu.org
Subject: Re: vc-update for bzr etc.
Date: Mon, 22 Nov 2010 20:40:40 -0500	[thread overview]
Message-ID: <87eiacg6lj.fsf@stupidchicken.com> (raw)
In-Reply-To: <jwvk4k58lpu.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Mon, 22 Nov 2010 09:41:52 -0500")

I've checked in the support for using vc-merge and vc-update with
DVCSes.  To summarize, this relies on two new state-changing VC
functions, vc-BACKEND-merge-branch (vc-BACKEND-merge was already taken,
for per-file merges) and vc-BACKEND-pull.

If the new functions are available, vc-merge/vc-update uses them; a
prefix argument prompts the user for the exact command to run, to allow
specifying flags or non-default source locations.  If the new functions
are unavailable, the old behavior (per file merges and updates) is
attempted.

vc-pull is an alias for vc-update.  (Should we make it the reverse?)

vc-bzr-pull and vc-bzr-merge-branch run asynchronously, outputting to a
display buffer.  Linking the filenames is desired but not implemented.
Maybe we should use compilation-mode for this, so that next-error can be
used to visit file conflicts?

Help refining this would be welcome.  And with the corresponding
features for other DVCS's.

Also, do I need to do anything special to update VC-dir buffers after
merging or pulling?



  reply	other threads:[~2010-11-23  1:40 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-21 15:43 vc-update for bzr etc Chong Yidong
2010-11-21 17:00 ` Andreas Schwab
2010-11-21 17:09 ` Dan Nicolaescu
2010-11-21 17:33   ` Chong Yidong
2010-11-21 20:20     ` Stefan Monnier
2010-11-21 21:08       ` Chong Yidong
2010-11-22  2:04         ` Stefan Monnier
2010-11-22  4:31           ` Stephen J. Turnbull
2010-11-22  8:40             ` Thien-Thi Nguyen
2010-11-22 11:04               ` Stephen J. Turnbull
2010-11-22 14:39             ` Stefan Monnier
2010-11-22 17:29               ` Chong Yidong
2010-11-23 15:37                 ` Stephen J. Turnbull
2010-11-23 16:20                   ` Stefan Monnier
2010-11-22  4:35           ` Chong Yidong
2010-11-22  6:52             ` Dan Nicolaescu
2010-11-22 14:42               ` Stefan Monnier
2010-11-22 10:54             ` Eli Zaretskii
2010-11-22 14:41               ` Stefan Monnier
2010-11-23  1:40                 ` Chong Yidong [this message]
2010-11-23 14:27                   ` Stefan Monnier
2010-11-23 16:08                     ` Chong Yidong
2010-11-23 17:03                       ` Dan Nicolaescu
2010-11-23 17:02                   ` Dan Nicolaescu
2010-11-23 19:29                     ` Chong Yidong
2010-11-23 22:05                       ` Stefan Monnier
2010-11-23 22:34                       ` Dan Nicolaescu
2010-11-24 17:19                         ` Chong Yidong
2010-11-22 16:57               ` Chong Yidong
2010-11-22 17:59                 ` Eli Zaretskii
2010-11-21 19:03 ` Stefan Monnier
2010-11-21 19:34   ` Chong Yidong

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=87eiacg6lj.fsf@stupidchicken.com \
    --to=cyd@stupidchicken.com \
    --cc=emacs-devel@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.