From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stephen Berman Newsgroups: gmane.emacs.help Subject: Re: vc-dir and Bazaar Date: Sat, 24 Jul 2010 13:56:56 +0200 Message-ID: <8739v9ytx3.fsf@escher.home> References: <87r5iube2m.fsf@escher.home> <87r5itzxy7.fsf@telefonica.net> <87tynpkh3k.fsf@escher.home> <83y6d18goj.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1279972654 25550 80.91.229.12 (24 Jul 2010 11:57:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 24 Jul 2010 11:57:34 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Sat Jul 24 13:57:33 2010 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OcdMC-0000Cx-M9 for geh-help-gnu-emacs@m.gmane.org; Sat, 24 Jul 2010 13:57:33 +0200 Original-Received: from localhost ([127.0.0.1]:50556 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OcdMC-0008F0-2K for geh-help-gnu-emacs@m.gmane.org; Sat, 24 Jul 2010 07:57:32 -0400 Original-Received: from [140.186.70.92] (port=48420 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OcdLn-0008Ev-9d for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 07:57:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OcdLl-0004I8-Q5 for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 07:57:07 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:40925) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OcdLl-0004I2-9i for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 07:57:05 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OcdLj-00006F-QH for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 13:57:03 +0200 Original-Received: from i59f55b36.versanet.de ([89.245.91.54]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 24 Jul 2010 13:57:03 +0200 Original-Received: from stephen.berman by i59f55b36.versanet.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 24 Jul 2010 13:57:03 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 40 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: i59f55b36.versanet.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:74273 Archived-At: On Sat, 24 Jul 2010 10:47:24 +0300 Eli Zaretskii wrote: >> From: Stephen Berman >> Date: Fri, 23 Jul 2010 23:45:19 +0200 >> >> > AFAIK, support for distributed features on VC(-dir) is still >> > missing. What you can use are the features common with centralized >> > systems: commit, diff, log, etc. >> >> How can I do that with vc-dir when I can't get a listing of any files at >> all? > > The commands pointed out by Óscar usually make sense on so-called > "interesting" files -- those you have uncommitted changes for, those > that were not add to the VC, etc. And vc-dir is documented to show > only those "interesting" files. In your case, evidently there are > none. > > IOW, before you can meaningfully use vc-dir, you need to do something > worthy of it ;-) E.g., modify some file. Ok. So, since my Emacs trunk tree is a mirror of the Savannah trunk and I only update it, I can't use vc-dir to do this. Moreover, I can't use it to merge the updated files from the trunk to my quickfixes branch. But once I have merged them from the command line, I can see them vc-dir (I just did this and do see them). So now I should be able to commit the merged files, right? I type `M' to mark all the files, then `v', then a log buffer pops, I write "Merge from trunk", type `C-c C-c' and get: "bzr: ERROR: Selected-file commit of merges is not supported yet: files ChangeLog, configure, configure.in, lisp/ChangeLog, lisp/play/tetris.el, lisp/progmodes/ps-mode.el, src/ChangeLog, src/alloc.c, src/font.c, src/frame.c, src/ralloc.c, src/w32menu.c" Does that mean I can only commit single files? It doesn't seem worth using vc-dir for that. I think the manual should document these limitations. Steve Berman