From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: emacs-devel <emacs-devel@gnu.org>
Subject: Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2
Date: Wed, 03 Apr 2013 13:32:36 -0400 [thread overview]
Message-ID: <jwvy5czh6b8.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <515725B5.20509@yandex.ru> (Dmitry Gutov's message of "Sat, 30 Mar 2013 21:49:41 +0400")
> But suppose that went fine. Would cd elpa/packages/company && bzr merge
> git://... work after that?
Yes (modulo spurious conflicts when a file is added to that git branch,
since the "bzr mv" we did before the "bzr split" only affects the file
that existed back then).
> Not sure I understand the alternative (two extra prepositions there), but
Sorry about "the the" it should read "least the".
> if it's just pasting Git commit hash into the message, that works for me.
Yes, just adding that hash is what I meant. It is the least amount of
info from which the rest can be reconstructed.
> That aside, almost all of company-mode change history is missing in elpa, so
> when the transition to Git is done, there's no reason not to fully re-import
> the directory from the upstream repo.
Agreed.
Stefan
prev parent reply other threads:[~2013-04-03 17:32 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
2013-03-30 17:49 ` Dmitry Gutov
2013-04-03 17:32 ` Stefan Monnier [this message]
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=jwvy5czh6b8.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=dgutov@yandex.ru \
--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 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.