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: Re: Bzr question about moving and renaming files Date: Thu, 20 Jun 2013 22:17:38 +0200 Message-ID: <87obb0h6zh.fsf@rosalinde.fritz.box> References: <87wqpohln3.fsf@rosalinde.fritz.box> <834ncspvnl.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1371759483 2066 80.91.229.3 (20 Jun 2013 20:18:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Jun 2013 20:18:03 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 20 22:18:04 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 1UplIv-0002Tn-6Z for ged-emacs-devel@m.gmane.org; Thu, 20 Jun 2013 22:18:01 +0200 Original-Received: from localhost ([::1]:47489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UplIu-0008SG-OL for ged-emacs-devel@m.gmane.org; Thu, 20 Jun 2013 16:18:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UplIj-0008H7-Rt for emacs-devel@gnu.org; Thu, 20 Jun 2013 16:17:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UplIa-0007Wd-PE for emacs-devel@gnu.org; Thu, 20 Jun 2013 16:17:49 -0400 Original-Received: from mout.gmx.net ([212.227.15.15]:56276) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UplIa-0007WH-E1 for emacs-devel@gnu.org; Thu, 20 Jun 2013 16:17:40 -0400 Original-Received: from mailout-de.gmx.net ([10.1.76.1]) by mrigmx.server.lan (mrigmx002) with ESMTP (Nemesis) id 0MPs8C-1Utcv33D86-004x77 for ; Thu, 20 Jun 2013 22:17:39 +0200 Original-Received: (qmail invoked by alias); 20 Jun 2013 20:17:39 -0000 Original-Received: from i59F54BAE.versanet.de (EHLO rosalinde.fritz.box) [89.245.75.174] by mail.gmx.net (mp001) with SMTP; 20 Jun 2013 22:17:39 +0200 X-Authenticated: #20778731 X-Provags-ID: V01U2FsdGVkX199vrUg3iB9+tNDoHGQS6Uxqjg6US0ium242qg7iY yDMUrP4PkqU4kd In-Reply-To: <834ncspvnl.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 20 Jun 2013 19:57:34 +0300") 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.15.15 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:160780 Archived-At: On Thu, 20 Jun 2013 19:57:34 +0300 Eli Zaretskii wrote: >> 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. I wasn't saying I already pushed the changes but asking what I should do when I push them. My test run was on a non-bound branch. >> 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. Yes, that's what Glenn's test also showed, but it doesn't seem to work using VC, see my followup to him. Steve Berman