From: Luke Lee <luke.yx.lee@gmail.com>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: Please don't obsolete "crisp.el"
Date: Wed, 9 Jul 2014 18:39:22 +0800 [thread overview]
Message-ID: <CAA=xLRMFZiwe1GSU-jQgJAQmWkcZn6B-wOZ7z=fmdmZS1S4UDw@mail.gmail.com> (raw)
In-Reply-To: <CAA=xLRM4WHqyrRTohGwSF37bNsyUx8+6U6O6e7ARKqmY0e0Dxw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]
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 <luke.yx.lee@gmail.com>:
> >> 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
[-- Attachment #2: Type: text/html, Size: 2318 bytes --]
next prev parent reply other threads:[~2014-07-09 10:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-07 9:13 Please don't obsolete "crisp.el" Luke Lee
2014-07-07 15:58 ` Glenn Morris
2014-07-07 16:36 ` Stefan Monnier
2014-07-08 5:01 ` Luke Lee
2014-07-08 18:42 ` Glenn Morris
2014-07-08 20:04 ` Stefan Monnier
2014-07-09 6:47 ` Luke Lee
2014-07-09 10:39 ` Luke Lee [this message]
2014-07-09 13:24 ` Stefan Monnier
2014-07-10 2:43 ` Luke Lee
2014-07-10 6:20 ` Luke Lee
2014-07-10 13:48 ` Stefan Monnier
2014-07-10 14:26 ` Stefan Monnier
2014-07-11 10:03 ` Luke Lee
2014-07-11 10:32 ` Yuri Khan
2014-07-14 10:28 ` Luke Lee
2014-07-11 12:44 ` Andreas Schwab
2014-07-14 10:30 ` Luke Lee
2014-07-11 13:32 ` Stefan Monnier
2014-07-14 10:29 ` Luke Lee
2014-07-21 2:26 ` luke.yx.lee
2014-07-21 4:00 ` Stefan Monnier
2014-07-12 14:47 ` Stephen Leake
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='CAA=xLRMFZiwe1GSU-jQgJAQmWkcZn6B-wOZ7z=fmdmZS1S4UDw@mail.gmail.com' \
--to=luke.yx.lee@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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).