From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Bzr question about moving and renaming files Date: Thu, 20 Jun 2013 19:57:34 +0300 Message-ID: <834ncspvnl.fsf@gnu.org> References: <87wqpohln3.fsf@rosalinde.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1371747454 583 80.91.229.3 (20 Jun 2013 16:57:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Jun 2013 16:57:34 +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 18:57:34 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 1UpiAu-0006rZ-SQ for ged-emacs-devel@m.gmane.org; Thu, 20 Jun 2013 18:57:32 +0200 Original-Received: from localhost ([::1]:44484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpiAu-0007Pz-HN for ged-emacs-devel@m.gmane.org; Thu, 20 Jun 2013 12:57:32 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpiAr-0007M2-Pn for emacs-devel@gnu.org; Thu, 20 Jun 2013 12:57:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpiAq-0002T6-Pb for emacs-devel@gnu.org; Thu, 20 Jun 2013 12:57:29 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:48857) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpiAq-0002T0-Hi for emacs-devel@gnu.org; Thu, 20 Jun 2013 12:57:28 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0MOP00800A801Y00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Thu, 20 Jun 2013 19:57:25 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MOP007TZB3OV8B0@a-mtaout22.012.net.il>; Thu, 20 Jun 2013 19:57:24 +0300 (IDT) In-reply-to: <87wqpohln3.fsf@rosalinde.fritz.box> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:160757 Archived-At: > From: Stephen Berman > Date: Thu, 20 Jun 2013 17:01:04 +0200 > > Now, when I push my changes to trunk at Savannah (via my local > mirror, which is bound to it) If your local mirror is bound to Savannah, then how did you commit your changes? Did you use "bzr ci --local"? If not, your commits are already on Savannah, because committing in a bound branch pushes the changes to the master repository. > 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. One commit should be all you need. It will reproduce on Savannah the entire history you have locally, including the rename.