From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: bazaar: "unable to obtain lock" Date: Thu, 31 Dec 2009 05:29:13 +0100 Message-ID: <87k4w3lqau.fsf@telefonica.net> References: <87my11gmf4.fsf@red-bean.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1262233796 15145 80.91.229.12 (31 Dec 2009 04:29:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 31 Dec 2009 04:29:56 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 31 05:29:49 2009 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 1NQCfU-0007Jb-QQ for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 05:29:49 +0100 Original-Received: from localhost ([127.0.0.1]:56549 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQCfV-0005UP-83 for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 23:29:49 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQCfQ-0005UJ-IE for emacs-devel@gnu.org; Wed, 30 Dec 2009 23:29:44 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQCfM-0005Tr-T0 for emacs-devel@gnu.org; Wed, 30 Dec 2009 23:29:44 -0500 Original-Received: from [199.232.76.173] (port=51076 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQCfM-0005To-Nz for emacs-devel@gnu.org; Wed, 30 Dec 2009 23:29:40 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:50676) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NQCfM-0001bw-CY for emacs-devel@gnu.org; Wed, 30 Dec 2009 23:29:40 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NQCfH-0007Ge-Ha for emacs-devel@gnu.org; Thu, 31 Dec 2009 05:29:35 +0100 Original-Received: from 217.red-88-24-214.staticip.rima-tde.net ([88.24.214.217]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 31 Dec 2009 05:29:35 +0100 Original-Received: from ofv by 217.red-88-24-214.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 31 Dec 2009 05:29:35 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 44 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 217.red-88-24-214.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) Cancel-Lock: sha1:1zJYpBeP2bdbWquI3fZJjA0eiZ0= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:119108 Archived-At: bob@gnu.org (Robert J. Chassell) writes: > So I have two directories, emacs/ which is the directory that holds the bazaar shared repository. The VC info is in emacs/.bzr > and emacs/trunk/, which is the directory that holds your local mirror of upstream trunk. It has its metainfo in the directory emacs/trunk/.bzr > and I can rename them to emacs/ and emacs/emacs/. That is fine except > I don't want to do that. I want to move emacs/trunk/ and all its > lower files to emacs/ and still be able to pull as well as I can now > (should I `pull' or should I `update'?) and still have the > emacs/quickfixes/ directory. This can be done, but do you *really* need that? emacs/trunk is mean to be just a gateway for communicating with upstream, why do you need it named as emacs/ ? Would it be okay for you to work on a regular branch named emacs/ but keep using emacs/trunk as the gateway? If yes, do that: # we rename the directory that holds the shared repo: mv emacs emacs-shared-repo # we create a regular branch for working: bzr branch emacs-shared-repo/trunk emacs For keeping your emacs/ branch up to date, pull on emacs-shared-repo/trunk and then pull or merge on emacs/. It is possible to pull directly to your emacs/ branch from upstream, but without more information about how do you work I don't know if it is advisable. > I tried that with `cp -R' a day or two > ago and `pull' failed. You probably polluted emacs/.bzr with the contents of emacs/trunk/.bzr. I would play safe and remove everything and start from scratch. > Of course, I may have made a mistake, but I wonder. -- Óscar