From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: Re: bazaar: "unable to obtain lock"
Date: Thu, 31 Dec 2009 05:29:13 +0100 [thread overview]
Message-ID: <87k4w3lqau.fsf@telefonica.net> (raw)
In-Reply-To: E1NQA8y-0004vf-T1@fencepost.gnu.org
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
next prev parent reply other threads:[~2009-12-31 4:29 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-29 23:53 bazaar: "unable to obtain lock" Robert J. Chassell
2009-12-30 3:39 ` Karl Fogel
2009-12-30 15:15 ` Robert J. Chassell
2009-12-31 19:14 ` Karl Fogel
2010-01-01 0:19 ` Robert J. Chassell
2009-12-31 19:15 ` Karl Fogel
2009-12-30 16:43 ` Robert J. Chassell
2009-12-30 17:25 ` Andreas Schwab
2009-12-30 21:46 ` Robert J. Chassell
2009-12-30 22:18 ` Andreas Schwab
2009-12-31 1:48 ` Robert J. Chassell
2009-12-31 4:29 ` Óscar Fuentes [this message]
2009-12-31 6:59 ` Óscar Fuentes
2009-12-31 11:32 ` Robert J. Chassell
2009-12-31 14:57 ` James Cloos
2009-12-30 23:34 ` Kevin Ryde
2009-12-31 0:30 ` Óscar Fuentes
2009-12-31 0:44 ` Lennart Borgman
2009-12-31 1:07 ` Óscar Fuentes
2009-12-31 1:24 ` Lennart Borgman
2010-01-03 22:38 ` Kevin Ryde
2010-01-04 7:05 ` Eli Zaretskii
2010-01-05 21:20 ` Kevin Ryde
2010-01-01 9:59 ` Stephen J. Turnbull
2010-01-01 10:16 ` Óscar Fuentes
2010-01-01 16:42 ` Jason Earl
2009-12-30 9:19 ` David Kastrup
-- strict thread matches above, loose matches on Subject: below --
2009-12-29 17:14 Juanma Barranquero
2009-12-29 17:40 ` Karl Fogel
2009-12-29 17:44 ` Juanma Barranquero
2009-12-29 18:42 ` Karl Fogel
2009-12-29 20:39 ` Juanma Barranquero
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k4w3lqau.fsf@telefonica.net \
--to=ofv@wanadoo.es \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).