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: Thu, 29 Jul 2010 15:33:42 +0200 Message-ID: <8762zyh0p5.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> <87vd84yhql.fsf@escher.home> <83r5is9603.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 1280410490 30808 80.91.229.12 (29 Jul 2010 13:34:50 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 29 Jul 2010 13:34:50 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Thu Jul 29 15:34: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 1OeTFv-0004YR-6G for geh-help-gnu-emacs@m.gmane.org; Thu, 29 Jul 2010 15:34:39 +0200 Original-Received: from localhost ([127.0.0.1]:40588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OeTFu-00007q-Ke for geh-help-gnu-emacs@m.gmane.org; Thu, 29 Jul 2010 09:34:38 -0400 Original-Received: from [140.186.70.92] (port=60451 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OeTFD-00005h-Vf for help-gnu-emacs@gnu.org; Thu, 29 Jul 2010 09:33:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OeTFB-0001YD-Uu for help-gnu-emacs@gnu.org; Thu, 29 Jul 2010 09:33:55 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:43630) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OeTFB-0001Xl-LK for help-gnu-emacs@gnu.org; Thu, 29 Jul 2010 09:33:53 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OeTF9-000474-UC for help-gnu-emacs@gnu.org; Thu, 29 Jul 2010 15:33:51 +0200 Original-Received: from i59f57067.versanet.de ([89.245.112.103]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 29 Jul 2010 15:33:51 +0200 Original-Received: from stephen.berman by i59f57067.versanet.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 29 Jul 2010 15:33:51 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 77 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: i59f57067.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:74334 Archived-At: On Sat, 24 Jul 2010 19:52:44 +0300 Eli Zaretskii wrote: >> From: Stephen Berman >> Date: Sat, 24 Jul 2010 18:20:02 +0200 >> >> Why "merge-news" instead of simply "merge"? Is there a difference? > > The "merge-news" method merges recent changes from the current > branch. That is different from "merge". > > You can see the list of all methods in the commentary at the beginning > of vc.el. > > That said, I agree that the message is confusingly technical, > especially since these methods are not documented in the manual. > Perhaps submit a bug report for that. I decided it's not serious enough; after the doc string of vc-update does use almost the same phrasing ("supports merging news"), even though it's still somewhat cryptic. >> > 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. > > The error message was for "bzr status", not for "bzr ci". So the > failed command was not the one which committed the merged files, it > was the "bzr status" command run afterwards to show the results in the > *vc-dir* buffer. > > The error message usually means that some other bzr command was > running when "bzr status" was invoked. You should be able to see what > commands where run at what times in your ~/.bzr.log file. > >> Should I report a bug about that? > > Yes, I think so. The file in the error message had been moved to another directory, and this somehow confused Bzr: 0.437 check paths: [u'admin/nt/makedist.bat'] 0.717 Traceback (most recent call last): File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 853, in exception_to_return_code return the_callable(*args, **kwargs) File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 1055, in run_bzr ret = run(*run_argv) File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 661, in run_argv_aliases return self.run_direct(**all_cmd_args) File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 665, in run_direct return self._operation.run_simple(*args, **kwargs) File "/usr/lib/python2.6/site-packages/bzrlib/cleanup.py", line 122, in run_simple self.cleanups, self.func, *args, **kwargs) File "/usr/lib/python2.6/site-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups result = func(*args, **kwargs) File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 1070, in ignore_pipe result = func(*args, **kwargs) File "/usr/lib/python2.6/site-packages/bzrlib/builtins.py", line 326, in run show_pending=(not no_pending), verbose=verbose) File "/usr/lib/python2.6/site-packages/bzrlib/status.py", line 160, in show_tree_status raise errors.PathsDoNotExist(nonexistents) PathsDoNotExist: Path(s) do not exist: admin/nt/makedist.bat I guess this is a Bazaar problem and not a VC-dir or Emacs problem. It did not recur on my subsequent update, so I'll just leave it for now. Steve Berman