From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Luke Lee Newsgroups: gmane.emacs.devel Subject: Re: Please don't obsolete "crisp.el" Date: Wed, 9 Jul 2014 18:39:22 +0800 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=047d7bfead80a56c9804fdc05423 X-Trace: ger.gmane.org 1404902457 25868 80.91.229.3 (9 Jul 2014 10:40:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 9 Jul 2014 10:40:57 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jul 09 12:40:52 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 1X4pIx-0003F5-Ue for ged-emacs-devel@m.gmane.org; Wed, 09 Jul 2014 12:40:52 +0200 Original-Received: from localhost ([::1]:59702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4pIx-0005io-Gz for ged-emacs-devel@m.gmane.org; Wed, 09 Jul 2014 06:40:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4pII-0005JV-ME for emacs-devel@gnu.org; Wed, 09 Jul 2014 06:40:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4pIH-0000hh-FF for emacs-devel@gnu.org; Wed, 09 Jul 2014 06:40:10 -0400 Original-Received: from mail-pd0-x231.google.com ([2607:f8b0:400e:c02::231]:39441) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4pIB-0000TT-Ew; Wed, 09 Jul 2014 06:40:03 -0400 Original-Received: by mail-pd0-f177.google.com with SMTP id y10so8727119pdj.22 for ; Wed, 09 Jul 2014 03:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=vXNicW66YJGmmZltaZi1ymKTm/V0Qg0M31O9zGvvGlA=; b=VKoy+XVOwVURv2/RGs9OZmCCiY7SI+Fnc1gVYBuPIe4tCldSRC5qDqHMCdjyr3MvI4 Wel40K8rM9iTh9Y3674gFIh0kumF2XDuCK0Cno+dPm9UkzbrXU3u6ub9sdY9RsiNdMxU NwFbJJlNFdrvY+RgIIRfo6v3Aj4A19gWrxvYrCMcKtC8sQWvjYfxU6j5t4FelOu9taq5 jmN7mnp0pzNUgK+vQtaFalcEpMiJKZBlJTzoSQ9OfAQjgUdEP4dBvQIoxqx9oPkf27Sn FE59rXara8lGFFft5uDJhOwbP2aFxtDGW6sL32r0+4g8GBxKYhUZng6/iPu0UM06NR+m Ju0Q== X-Received: by 10.70.43.3 with SMTP id s3mr10489735pdl.11.1404902402515; Wed, 09 Jul 2014 03:40:02 -0700 (PDT) Original-Received: by 10.70.89.165 with HTTP; Wed, 9 Jul 2014 03:39:22 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::231 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:172911 Archived-At: --047d7bfead80a56c9804fdc05423 Content-Type: text/plain; charset=UTF-8 Another drawback is that we might be confused since the history will contain both Emacs trunk commit messages and ELPA messages. However I've figure out a solution: to add a marker or notice message like "(Merged from Emacs trunk)" at each of the of the crisp.el commit message using "git filter-branch --msg-filter". I've tried that successfully in my local repo. 2014-07-09 14:47 GMT+08:00 Luke Lee : > >> But it would be good to preserve the VCS history of the file, if > possible. > > > > I don't think that's practical (maybe some VCS will support this well at > > some point, but currently I think it'd be too much hassle for too little > > benefit). > > Since ELPA is VCS by git and we have an Emacs git clone, it's not > difficult. I tried that in my local repo and successfully merged the full > history of crisp.el from Emacs to ELPA. The only inconvenience is that > we'll > need to apply "--follow" argument when doing "git log crisp.el " to be able > to see the full history of crisp.el. Otherwise "git log crisp.el" only > shows > the one that I move it into "packages/crisp-mode". > > Basically I followed the steps described in StackOverflow, with some extra > steps I successfully merging the full history of crisp.el *ONLY*. The > original > flow is discussed here: "http://stackoverflow.com/questions/1365541/ > > how-to-move-files-from-one-git-repo-to-another-not-a-clone-preserving-history" > > If it's okay with all of you, I'll commit the full history of crisp.el > into ELPA, and > also keep it in Emacs obsolete. > -- Best regards, Luke Lee --047d7bfead80a56c9804fdc05423 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Another drawback is that we might be c= onfused since the history will
contain both Emacs trunk commit mes= sages and ELPA messages.
However I've figure out a solution: to add = a marker or notice message
like "(Merged from Emacs trunk)" at each of the of the cris= p.el commit
message using "git filter-branch --msg-filter&quo= t;. I've tried that successfully
in my local repo.


2014-07-09 14= :47 GMT+08:00 Luke Lee <luke.yx.lee@gmail.com>:
>> But it would be good to= preserve the VCS history of the file, if possible.
>
> I don&#= 39;t think that's practical (maybe some VCS will support this well at > some point, but currently I think it'd be too much hassle for too = little
> benefit).

Since ELPA is VCS by git and we have an Emacs g= it clone, it's not
difficult. I tried that in my local repo and succ= essfully merged the full
history of crisp.el from Emacs to ELPA. The onl= y inconvenience is that we'll
need to apply "--follow" argument when doing "git log crisp.= el " to be able
to see the full history of crisp.el. Otherwise &quo= t;git log crisp.el" only shows
the one that I move it into "pa= ckages/crisp-mode".

Basically I followed the steps described in StackOverflow, with some ex= tra
steps I successfully merging the full history of crisp.el *ONLY*. Th= e original
flow is discussed here: "http://stackoverflow.com/questio= ns/1365541/
how-to-move-files-from-one-git-repo-to-another-not-a-clone-preserving-histo= ry"

If it's okay with all of you, I'll commit the= full history of crisp.el into ELPA, and
also keep it in Emacs obs= olete.



--
Best regards,
Luke = Lee

--047d7bfead80a56c9804fdc05423--