From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stephen Berman Newsgroups: gmane.emacs.devel Subject: Bzr question about moving and renaming files Date: Thu, 20 Jun 2013 17:01:04 +0200 Message-ID: <87wqpohln3.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1371741050 21746 80.91.229.3 (20 Jun 2013 15:10:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Jun 2013 15:10:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 20 17:10:50 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UpgVX-0006tp-Pv for ged-emacs-devel@m.gmane.org; Thu, 20 Jun 2013 17:10:43 +0200 Original-Received: from localhost ([::1]:34355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpgMU-0003r1-OL for ged-emacs-devel@m.gmane.org; Thu, 20 Jun 2013 11:01:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpgML-0003go-KP for emacs-devel@gnu.org; Thu, 20 Jun 2013 11:01:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpgMF-0004Pt-4k for emacs-devel@gnu.org; Thu, 20 Jun 2013 11:01:13 -0400 Original-Received: from mout.gmx.net ([212.227.17.22]:64263) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpgME-0004Pf-Sa for emacs-devel@gnu.org; Thu, 20 Jun 2013 11:01:07 -0400 Original-Received: from mailout-de.gmx.net ([10.1.76.16]) by mrigmx.server.lan (mrigmx002) with ESMTP (Nemesis) id 0MW5VH-1UnHeV0NGz-00XOtY for ; Thu, 20 Jun 2013 17:01:06 +0200 Original-Received: (qmail invoked by alias); 20 Jun 2013 15:01:05 -0000 Original-Received: from i59F54BAE.versanet.de (EHLO rosalinde.fritz.box) [89.245.75.174] by mail.gmx.net (mp016) with SMTP; 20 Jun 2013 17:01:05 +0200 X-Authenticated: #20778731 X-Provags-ID: V01U2FsdGVkX19hKURqhPNhiVqBD9k/CPu4xZ6ptTJhzkDk0zrdY+ VkB9tvZoX4KAA4 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.17.22 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:160747 Archived-At: I'm getting close to committing my new version of todo-mode.el (except for the Texinfo user manual, which will take more time), and want to try and avoid any unpleasant mistake with bzr, which I'm not all that experienced with. I did a test run in my local branch, and had to use two commits: first, rename calendar/todo-mode.el to obsolete/otodo-mode.el, commit this, and then add the new version as calendar/todo-mode.el and commit that. I had tried adding the new version before committing the rename, but vc-rename-file errored with "Please update files before moving them". Now, when I push my changes to trunk at Savannah (via my local mirror, which is bound to it), do I have to replicate this two-step procedure, or can I just do one bzr commit (or rather `C-c C-c' from the VC log buffer) and that will install the new version in calendar/, overwriting the old version, and install the renamed old version in obsolete/? I'm guessing I have to do it in two commits, but I'd appreciate confirmation, or, if it is possible to do it in one commit, a recipe for how to do it. Steve Berman