From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: luke.yx.lee@gmail.com Newsgroups: gmane.emacs.devel Subject: Re: Please don't obsolete "crisp.el" Date: Mon, 21 Jul 2014 10:26:25 +0800 Message-ID: References: Reply-To: luke.yx.lee@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1405909629 9338 80.91.229.3 (21 Jul 2014 02:27:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Jul 2014 02:27:09 +0000 (UTC) Cc: Stefan Monnier , emacs-devel@gnu.org To: Luke Lee Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jul 21 04:27:02 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1X93Jd-0007v5-Li for ged-emacs-devel@m.gmane.org; Mon, 21 Jul 2014 04:27:01 +0200 Original-Received: from localhost ([::1]:60335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X93Jc-00047E-Rp for ged-emacs-devel@m.gmane.org; Sun, 20 Jul 2014 22:27:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X93JR-000477-VZ for emacs-devel@gnu.org; Sun, 20 Jul 2014 22:26:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X93JI-0006xX-SA for emacs-devel@gnu.org; Sun, 20 Jul 2014 22:26:49 -0400 Original-Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]:46182) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X93JI-0006xF-Km; Sun, 20 Jul 2014 22:26:40 -0400 Original-Received: by mail-pa0-f54.google.com with SMTP id fa1so8801249pad.13 for ; Sun, 20 Jul 2014 19:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:references:reply-to:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=eBMa3GzIuvrBDfsc8J36DUjBeigcXxmdrhsGCr+Vfmc=; b=nR9GatWpGoRxw+XRgt9x1cwWbhddsDSdZqS0PCjIOpHIzV2FxXYOz4jk5YmFD64N/8 iT7Bz1M20moNDjxOQUaC06JXnfLNX/XOJ9ZNP38OhljHccCa452DiY9CVr0oe4KjwR83 l3JxaYvT+u85zxl7dJDAH20pIi1jIhz5ENdAZNpToJzg1YL5y3L0e9Qlwrk81VJCvEQj 9+4RhRGseqsJYGJO72b8ZA5u47iTOHdCCbUJoUJ5d0F/g7vdDsNEUn6dZpoHCa/2NSJv g6gjD0wAiQd2AbVCK1VS78ookhbB8kAvo53CaOoS/7rr6Q+KwDGu/fAWiZL7wqEvah9E Q/0w== X-Received: by 10.70.43.106 with SMTP id v10mr18901684pdl.16.1405909598960; Sun, 20 Jul 2014 19:26:38 -0700 (PDT) Original-Received: from tw-fw-dt-1 (59-120-45-147.HINET-IP.hinet.net. [59.120.45.147]) by mx.google.com with ESMTPSA id xc1sm52028842pab.39.2014.07.20.19.26.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 20 Jul 2014 19:26:38 -0700 (PDT) In-Reply-To: (Luke Lee's message of "Mon, 14 Jul 2014 18:29:30 +0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::236 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:173064 Archived-At: Hi all, I plan to apply my proposed steps as follows to transfer the history of crisp from Emacs to ELPA in a few days. If no one objects, I'll proceed on that. If you have any concern about this, please inform me. Thanks! Luke Lee writes: > > Here I conclude my steps to move crisp.el's history from Emacs to > ELPA. Feel > free to adjust the steps for landmark.el: > > 1. Preparing crisp.el history in Emacs repository: > 1.1. "cd emacs.git" > > 1.2. "git log --follow --name-status lisp/obsolete/crisp.el" > # We saw crisp.el moved from emulation/ to obsolete/ in the beginning, > > 1.3. Create a big patch from lisp/emulation: > "git log -p --pretty=email --reverse --follow lisp/emulation/crisp.el >> cirsp-history.patch" > # Here I saw 56 commits in this big patch > > (1.4) Mangle the commit messages in crisp-history.patch to notify > these commits comes from Emacs repo. > > 2. Import crisp.el history into ELPA repository: > 2.1. Clone an ELPA to "elpa.crisp" directory > > 2.2. "cd elpa.crisp" > > 2.3. Create a new branch with no commits: > "git checkout --orphan crisp-in-emacs" > > 2.4. Remeber to delete everything for later "git am" to succeed: > "git reset --hard" > > 2.5. Import the commit history that we just created, keeping the > correct > commit date/time: > "git am --committer-date-is-author-date . > ./emacs.git/crisp-history.patch" > > 2.6. During the process git will pause several times for failing apply > the patches. We need to manually fix them. I found all those patch > failure are about the copyright message chagne. So I just manually > applied the changes and do "git am --continue" to keep going, or do > "git am --skip" > if those changes are already in place. > > 2.7. Now we've the latest Emacs crisp.el in ELPA/lisp/emulation, now > move it to a new package dir: > "git mv lisp/emulation/crisp.el package/crisp-mode" > "git commit -m 'Move crisp-mode from Emacs trunk to ELPA'" > > 2.8. Now we're ready to merge it back to master: > "git checkout master" > > 2.9. "git merge crisp-in-emacs" > with commit message > "Merge crisp-mode package from Emacs repository" > We're done. Now examine the repository history. > > (2.10) (Not done yet) Now push it back with "git push ...". > > If everyone is okay with that, I'll commit the merge. Of course, > before I did that we should have a proper message prefix/postfix > the commit messages from Emacs trunk, to prevent confusing ELPA > existing commit log (i.e. the above skipped step 1.4).