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 07:59:13 +0100 Message-ID: <87zl4zk4se.fsf@telefonica.net> References: <87my11gmf4.fsf@red-bean.com> <87k4w3lqau.fsf@telefonica.net> 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 1262242807 32636 80.91.229.12 (31 Dec 2009 07:00:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 31 Dec 2009 07:00:07 +0000 (UTC) Cc: bob@gnu.org To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 31 07:59:59 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 1NQF0o-0005GQ-5I for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 07:59:58 +0100 Original-Received: from localhost ([127.0.0.1]:32800 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQF0o-0008Iw-DU for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 01:59:58 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQF0b-0008Hy-Ry for emacs-devel@gnu.org; Thu, 31 Dec 2009 01:59:45 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQF0W-0008H5-Kf for emacs-devel@gnu.org; Thu, 31 Dec 2009 01:59:45 -0500 Original-Received: from [199.232.76.173] (port=45807 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQF0W-0008H2-Bp for emacs-devel@gnu.org; Thu, 31 Dec 2009 01:59:40 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:59549) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NQF0V-0004RD-MZ for emacs-devel@gnu.org; Thu, 31 Dec 2009 01:59:40 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NQF0S-0005DG-Na for emacs-devel@gnu.org; Thu, 31 Dec 2009 07:59:36 +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 07:59:36 +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 07:59:36 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 29 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:5W+LRcj9UK7H6oxD+9mCKMygIRw= 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:119121 Archived-At: Óscar Fuentes writes: [snip] >> 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. BTW, if you are very bandwith-constrained, you can do that without re-downloading: bzr init-repo new-emacs-shared-repo cd new-emacs-shared-repo bzr branch ../emacs/trunk trunk cd trunk bzr bind URL_TO_UPSTREAM_TRUNK cd .. bzr branch trunk quickfixes cd .. rm -rf emacs-shared-repo This to replicate the recommend setup on BzrForEmacsDevs (re-check the document just in case I forgot something). -- Óscar