From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.help Subject: Re: vc-dir and Bazaar Date: Sat, 24 Jul 2010 15:21:49 +0300 Message-ID: <83tynp83z6.fsf@gnu.org> References: <87r5iube2m.fsf@escher.home> <87r5itzxy7.fsf@telefonica.net> <87tynpkh3k.fsf@escher.home> <83y6d18goj.fsf@gnu.org> <8739v9ytx3.fsf@escher.home> NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1279974161 29747 80.91.229.12 (24 Jul 2010 12:22:41 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 24 Jul 2010 12:22:41 +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 14:22:40 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 1OcdkU-0000Kb-M3 for geh-help-gnu-emacs@m.gmane.org; Sat, 24 Jul 2010 14:22:39 +0200 Original-Received: from localhost ([127.0.0.1]:57520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OcdkU-0004qH-4w for geh-help-gnu-emacs@m.gmane.org; Sat, 24 Jul 2010 08:22:38 -0400 Original-Received: from [140.186.70.92] (port=58930 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ocdk5-0004qC-JT for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 08:22:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ocdk3-00008l-PD for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 08:22:13 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:36003) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ocdk3-00008X-Hi for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 08:22:11 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0L6200M009WJR000@a-mtaout22.012.net.il> for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 15:21:51 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.127.61.30]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L6200KDVACD8S80@a-mtaout22.012.net.il> for help-gnu-emacs@gnu.org; Sat, 24 Jul 2010 15:21:50 +0300 (IDT) In-reply-to: <8739v9ytx3.fsf@escher.home> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:74274 Archived-At: > 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. > 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? > 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.