From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Glenn Morris <rgm@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Repairing the elpa branch
Date: Mon, 14 Jan 2013 20:44:15 -0500 [thread overview]
Message-ID: <jwvmwwbp6lf.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <qkd2x7wv26.fsf@fencepost.gnu.org> (Glenn Morris's message of "Mon, 14 Jan 2013 12:09:21 -0500")
>> And the r170 merge is not special, IIUC.
> Oh, I thought it was because it came from bzr-git, or bzr join, or
> something?
Yes (it's actually a bzr join of a bzr-git branch), but most of the
other merges do as well.
>> It was just the first such merges, so if you replace it with a flat
>> commit, the next merge will turn into the source of the problem.
> Then it seems pointless for me to try and copy the merges?
> But r10, 28, 33, 76 were also merges...
IIUC these are "normal merges" of Bzr branches of elpa (and AFAIK these
branches were very short lived and we don't need to keep track of that
merge metadata for future merges).
Stefan
next prev parent reply other threads:[~2013-01-15 1:44 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-14 3:25 Repairing the elpa branch Glenn Morris
2013-01-14 4:11 ` Stefan Monnier
2013-01-14 4:26 ` Chong Yidong
2013-01-14 15:15 ` Stefan Monnier
2013-01-14 15:40 ` Eli Zaretskii
2013-01-14 17:10 ` Glenn Morris
2013-01-14 17:22 ` Eli Zaretskii
2013-01-14 17:28 ` Glenn Morris
2013-01-14 17:54 ` Eli Zaretskii
2013-01-14 18:13 ` Andreas Schwab
2013-01-14 19:16 ` Eli Zaretskii
2013-01-15 1:38 ` Stefan Monnier
2013-01-15 3:59 ` Eli Zaretskii
2013-01-15 4:05 ` Stefan Monnier
2013-01-15 9:02 ` Andreas Schwab
2013-01-15 13:39 ` Stefan Monnier
2013-01-15 15:33 ` Stephen J. Turnbull
2013-01-15 16:26 ` Eli Zaretskii
2013-01-15 17:38 ` Glenn Morris
2013-01-15 18:45 ` Glenn Morris
2013-01-15 18:55 ` Eli Zaretskii
2013-01-15 20:21 ` Glenn Morris
2013-01-15 22:13 ` Stefan Monnier
2013-01-14 17:09 ` Glenn Morris
2013-01-15 1:44 ` Stefan Monnier [this message]
2013-01-15 4:16 ` Glenn Morris
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=jwvmwwbp6lf.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=rgm@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.