[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: vc-update for bzr etc.

From: Chong Yidong
Subject: Re: vc-update for bzr etc.
Date: Mon, 22 Nov 2010 20:40:40 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

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

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 via email to

[Prev in Thread] Current Thread [Next in Thread]