From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Dmitry Gutov <raaahh@gmail.com>
Cc: emacs-devel <emacs-devel@gnu.org>
Subject: Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2
Date: Sat, 30 Mar 2013 13:12:40 -0400 [thread overview]
Message-ID: <jwvfvzcrh6m.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <51566B13.2000708@gmail.com> (Dmitry Gutov's message of "Sat, 30 Mar 2013 08:33:23 +0400")
> My achievement so far:
> C:\Users\gutov\vc\emacs-bzr\elpa\packages\company>bzr merge
> git://github.com/company-mode/company-mode.git
> bzr: ERROR: exceptions.AssertionError: Invalid sha for <Commit
> 6aea960adb30c66faa14e4bd57a4e62e94eacd94>:
> 2a59ce05bd0a86db1911f07adb942f10b8540614
In my experience bzr-git works significantly better on a local branch, so
I always first make a local Git clone. More specifically I normally do:
git clone <giturl> # Done because bzr-git works better locally
bzr branch <localgit> tmp
cd tmp
bzr mkdir .newroot
bzr mv * .newroot/
... maybe other bzr mv .<blabla> .newroot/ ...
bzr split .newroot
mv .newroot .../elpa/packages/<package>
cd .../elpa/packages/
bzr join <package>
the "bzr mv+bzr split" dance is necessary to work around a limitation of
bzr-git where all the root directories have the same "id", so the first
"bzr join" worked (tho it introduced the all too famous commit that then
triggers a bug in "bzr checkout"), but ever since we first need to do
this dance that moves all the files to another root directory (hence
with a different "id").
This said, I just tried it and the "bzr join" failed with "inventory
already contains entry with id {README.md}": apparently there are more
problems of id-collisions than the root directory.
> Do you mind if, while ELPA transition to Git is still is progress, I commit
> the latest version in the same manner as before?
No, please do. Just please try and preserve some of the info, e.g. by
copying the "git log" or at the the revision id from which you merged.
Stefan
next prev parent reply other threads:[~2013-03-30 17:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1UJXgb-000646-9w@vcs.savannah.gnu.org>
[not found] ` <jwvehf5pr68.fsf-monnier+emacs@gnu.org>
2013-03-24 1:05 ` [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2 Dmitry Gutov
2013-03-24 14:14 ` Stefan Monnier
2013-03-25 11:20 ` Dmitry Gutov
2013-03-30 4:33 ` Dmitry Gutov
2013-03-30 17:12 ` Stefan Monnier [this message]
2013-03-30 17:49 ` Dmitry Gutov
2013-04-03 17:32 ` Stefan Monnier
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvfvzcrh6m.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=raaahh@gmail.com \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.