From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: bzr handholding: moving branches inside a shared repository Date: Thu, 07 Jan 2010 22:31:51 -0500 Message-ID: References: <3liqbdwcgw.fsf@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1262921542 8381 80.91.229.12 (8 Jan 2010 03:32:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 03:32:22 +0000 (UTC) Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 04:32:14 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NT5a9-00027u-8i for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 04:32:13 +0100 Original-Received: from localhost ([127.0.0.1]:35777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NT5a9-0003Rg-EK for ged-emacs-devel@m.gmane.org; Thu, 07 Jan 2010 22:32:13 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NT5a2-0003Qh-4M for emacs-devel@gnu.org; Thu, 07 Jan 2010 22:32:06 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NT5Zx-0003Mp-Ax for emacs-devel@gnu.org; Thu, 07 Jan 2010 22:32:05 -0500 Original-Received: from [199.232.76.173] (port=41972 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NT5Zx-0003Mm-0G for emacs-devel@gnu.org; Thu, 07 Jan 2010 22:32:01 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:9136 helo=ironport2-out.pppoe.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NT5Zu-0005e7-NC; Thu, 07 Jan 2010 22:31:58 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArsEAP41RkvO+KPG/2dsb2JhbACBRNMChC8Eiik X-IronPort-AV: E=Sophos;i="4.49,239,1262581200"; d="scan'208";a="53340261" Original-Received: from 206-248-163-198.dsl.teksavvy.com (HELO ceviche.home) ([206.248.163.198]) by ironport2-out.pppoe.ca with ESMTP; 07 Jan 2010 22:31:51 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 8F569B4270; Thu, 7 Jan 2010 22:31:51 -0500 (EST) In-Reply-To: <3liqbdwcgw.fsf@fencepost.gnu.org> (Glenn Morris's message of "Thu, 07 Jan 2010 21:35:11 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:119643 Archived-At: > Which is correct? If I have my branch in a directory called "trunk" > inside a shared repository, can I safely rename it to "trunk-foo"? Yes. > If I copy it to "trunk-copy", does this become an independent copy? Yes. But other branches may refer to "trunk" in their .bzr/branch/branch.conf file, so subsequent "bzr merge" (or similar) commands may keep trying to refer to "trunk", at which point you'll have to explicitly use "bzr merge --remember ../trunk-foo" to update the corresponding data. Stefan