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 18:20:02 +0200 Message-ID: <87vd84yhql.fsf@escher.home> References: <87r5iube2m.fsf@escher.home> <87r5itzxy7.fsf@telefonica.net> <87tynpkh3k.fsf@escher.home> <83y6d18goj.fsf@gnu.org> <8739v9ytx3.fsf@escher.home> <83tynp83z6.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1279988446 4965 80.91.229.12 (24 Jul 2010 16:20:46 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 24 Jul 2010 16:20:46 +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 18:20:45 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 1OchSu-0005fG-Rz for geh-help-gnu-emacs@m.gmane.org; Sat, 24 Jul 2010 18:20:45 +0200 Original-Received: from localhost ([127.0.0.1]:36240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OchSu-00037K-5r for geh-help-gnu-emacs@m.gmane.org; Sat, 24 Jul 2010 12:20:44 -0400 Original-Received: from [140.186.70.92] (port=43905 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OchSR-00036I-Rz for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 12:20:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OchSN-00046f-Vw for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 12:20:15 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:60806) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OchSN-00046W-JK for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 12:20:11 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OchSM-0005Q2-Oj for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 18:20:10 +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 18:20:10 +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 18:20:10 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 60 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:74276 Archived-At: On Sat, 24 Jul 2010 15:21:49 +0300 Eli Zaretskii wrote: >> From: Stephen Berman >> Date: Sat, 24 Jul 2010 13:56:56 +0200 >> >> > 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. > > Right. That's what the "merge-news is not implemented part" is about. Why "merge-news" instead of simply "merge"? Is there a difference? The former term sounds strange and is confusing in a UI error message. >> 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? > > Yes. > >> 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? > > Yes, but more importantly, you can commit _all_ of the pending merges > if you just don't mark any files. That's what you should do most of > the time anyway, this being a changeset-based VCS, right? Ah, thanks, I somehow overlooked this in the doc string. That did what I wanted; but after it executed, I got this message: "vc-do-command: Running bzr status admin/nt/makedist.bat...FAILED (status 3)" and the *vc-dir* buffer showed all the files as uncommitted that it displayed before I had type `v'. But when I refreshed the buffer, it showed only the directories. And when I tried to commit the merged files from the command line, it said there were no changes to commit. So `v' worked in vc-dir despite the error message and the non-updated display. Should I report a bug about that? >> I think the manual should document these limitations. > > The manual doesn't like to mention limitations of a temporary nature, > because they are expected to be solved in some future release. The > manual only mentions limitations that cannot be lifted at all or > without a major programming effort. That's reasonable; yet reading that VC supports Bazaar does lead one to expect full support... Thanks for the feedback. Steve Berman