unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: emacs-devel@gnu.org
Subject: Re: ELPA commit freeze
Date: Tue, 20 Aug 2013 01:16:57 -0400	[thread overview]
Message-ID: <jwvbo4tq77j.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <5211BBC8.40408@yandex.ru> (Dmitry Gutov's message of "Mon, 19 Aug 2013 09:31:36 +0300")

> The packages/js2-mode subtree history is wrong,

That's for sure: it pretends that all changes until the conversion to
Git happened directly in `elpa'.

> so the wrong history got pushed.

I'd expect this history to be "the true js2-mode history plus
a redundant copy of that history from the packages/js-2mode directory of
the Bzr branch".  Is that the case, or do you get "the true js-2mode
history plus the complete history of the whole elpa branch".

In the case of a "duplicate history", I think it's about as good as it's
going to get, because of the fact that the "subtree merge" was only made
at the end.  To get something better, we'd have to reconstruct the elpa
branch bit by bit, performing the merges as if they'd been done right
back when we added/updated all those externally maintained branches.

> You did. See 293db6e (Fix up copyrights and the checking code).

I think this was before I fixed the email-massaging scripts to adjust to
the new format.  I'll install one of my pending minor cleanups to the
js2-mode, so we can make sure it works.


        Stefan



  reply	other threads:[~2013-08-20  5:16 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-14  1:10 ELPA commit freeze Stefan Monnier
2013-08-14  7:46 ` Andreas Schwab
2013-08-14 14:42   ` Stefan Monnier
2013-08-15  1:12     ` Xue Fuqiao
2013-08-15  4:18       ` Stefan Monnier
2013-08-15 14:51         ` Eli Zaretskii
2013-08-15 15:29           ` Andreas Schwab
2013-08-15 15:44             ` Eli Zaretskii
2013-08-15 16:04               ` Andreas Schwab
2013-08-15 16:37                 ` Eli Zaretskii
2013-08-15 16:42                   ` Andreas Schwab
2013-08-15 17:06                     ` Eli Zaretskii
2013-08-15 17:16                       ` Eli Zaretskii
2013-08-20 18:20               ` Steinar Bang
2013-08-20 18:38                 ` Eli Zaretskii
2013-08-21  7:06                   ` Steinar Bang
2013-08-15 16:44           ` Stefan Monnier
2013-08-15 19:25         ` Glenn Morris
2013-08-15 20:33           ` Stefan Monnier
2013-08-15 20:41             ` Glenn Morris
2013-08-15 21:31               ` Stefan Monnier
2013-08-15 21:50                 ` Glenn Morris
2013-08-14  9:56 ` Dmitry Gutov
2013-08-14 14:43   ` Stefan Monnier
2013-08-17 16:34     ` Dmitry Gutov
2013-08-19  2:39       ` Stefan Monnier
2013-08-19  6:31         ` Dmitry Gutov
2013-08-20  5:16           ` Stefan Monnier [this message]
2013-08-20  9:26             ` Dmitry Gutov
2013-08-20  9:40               ` Andreas Schwab
2013-08-20 13:42                 ` Dmitry Gutov
2013-08-20 14:08                   ` Andreas Schwab
2013-08-20 23:12                     ` Dmitry Gutov
2013-08-20 14:45               ` Stefan Monnier
2013-08-20 23:22                 ` Dmitry Gutov
2013-08-21  4:21                   ` Stefan Monnier
2013-08-21  7:53                     ` Dmitry Gutov
2013-08-21 19:56                       ` Stefan Monnier
2013-08-21 23:38                         ` Dmitry Gutov
2013-08-21  4:23                   ` Stefan Monnier
2013-08-21  8:00                     ` Dmitry Gutov
2013-08-21 20:00                       ` Stefan Monnier
2013-08-21 21:51                         ` Dmitry Gutov
2013-08-21 23:56                           ` Stefan Monnier
2013-08-22  0:20                             ` Dmitry Gutov
2013-08-22  1:55                               ` Stefan Monnier
2013-08-22  8:47                                 ` Dmitry Gutov
2013-08-22 20:35                                   ` Stefan Monnier
2013-08-22 21:14                                     ` Dmitry Gutov
2013-08-23  0:51                                       ` Stefan Monnier
2013-08-23  1:28                                         ` Dmitry Gutov
2013-08-23  4:12                                           ` Stefan Monnier
2013-08-23 12:01                                             ` Dmitry Gutov
2013-08-23 15:05                                               ` Stefan Monnier
2013-08-24  1:16                                                 ` Dmitry Gutov
  -- strict thread matches above, loose matches on Subject: below --
2013-08-23 17:44 Donald Curtis
2013-08-23 23:04 ` 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

  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=jwvbo4tq77j.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 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).