From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Bzr question about moving and renaming files Date: Thu, 20 Jun 2013 11:26:35 -0400 Message-ID: References: <87wqpohln3.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1371742007 2767 80.91.229.3 (20 Jun 2013 15:26:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Jun 2013 15:26:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stephen Berman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 20 17:26:48 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 1Upgl5-0008KP-FJ for ged-emacs-devel@m.gmane.org; Thu, 20 Jun 2013 17:26:47 +0200 Original-Received: from localhost ([::1]:33672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upgl5-000163-2w for ged-emacs-devel@m.gmane.org; Thu, 20 Jun 2013 11:26:47 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upgkz-0000zI-KN for emacs-devel@gnu.org; Thu, 20 Jun 2013 11:26:42 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Upgkv-0004fR-2T for emacs-devel@gnu.org; Thu, 20 Jun 2013 11:26:41 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34544) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upgkv-0004fD-02 for emacs-devel@gnu.org; Thu, 20 Jun 2013 11:26:37 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Upgkt-0008Pm-Q3; Thu, 20 Jun 2013 11:26:36 -0400 X-Spook: LABLINK CNCIS BLU-97 A/B CISU event security SHA X-Ran: sN.XgmfF$*bOR\od\^ujC,oe<=ih-^r`V;U+_%hCY%M`4VbVUew&)(su+qh2r$}nL`F{n@ X-Hue: cyan X-Attribution: GM In-Reply-To: <87wqpohln3.fsf@rosalinde.fritz.box> (Stephen Berman's message of "Thu, 20 Jun 2013 17:01:04 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:160749 Archived-At: Stephen Berman wrote: > 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". I am sure you would get a more authoritative answer to bzr questions on the bzr mailing list, but it works fine for me to use one commit: mkdir /tmp/foo cd /tmp/foo bzr init touch foo bzr add foo bzr commit -m "c1" bzr mv foo bar touch foo bzr add foo bzr commit -m "c2"