From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: cyd@gnu.org, schwab@linux-m68k.org, emacs-devel@gnu.org
Subject: Re: Repairing the elpa branch
Date: Tue, 15 Jan 2013 18:26:43 +0200 [thread overview]
Message-ID: <83622yqunw.fsf@gnu.org> (raw)
In-Reply-To: <jwvvcayftve.fsf-monnier+emacs@gnu.org>
> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: Eli Zaretskii <eliz@gnu.org>, cyd@gnu.org, emacs-devel@gnu.org
> Date: Tue, 15 Jan 2013 08:39:52 -0500
>
> >> Yes, you see merges, but they are from rewritten branches (with
> >> different revids), so they're useless when you try to sync up with the
> >> upstream branch because there's no common ancestor any more.
> > This will happen with _any_ rewriting.
>
> No: not if the rewrite only rewrites the mainline and not the branches.
But the common ancestors are (usually) on the mainline. So you'd need
to keep the mainline rev-ids unaltered as well, no?
next prev parent reply other threads:[~2013-01-15 16:26 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 [this message]
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
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
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=83622yqunw.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=cyd@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=schwab@linux-m68k.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).