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: Fri, 11 Jul 2014 18:03:49 +0800 [thread overview]
Message-ID: <CAA=xLRNUOeSt4HSwQzNXS1-wHDHX=Tpah2PgaT_T799McFvqRA@mail.gmail.com> (raw)
In-Reply-To: <jwvoawxnwvw.fsf-monnier+emacs@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1962 bytes --]
> git log --follow lisp/obsolete/crisp.el | grep commit | wc
>
> gives me 56 entries, which all seem to have touched crisp.el, so the
> mirroring doesn't seem to be the problem.
> ...
> Also, "git log -p --follow lisp/obsolete/crisp.el" seems to include just
> the crisp.el changes, so passing it to "git am" might DTRT.
Cool! The "git log -p --follow lisp/obsolete/crisp.el" is indeed very clean!
However, the bad thing is that we can't add "--reverse" to reverse the
commit order from the beginning, so "git am" will immediately fail. Later
I figure out the correct sequence using lisp/emulation instead:
git log --pretty=email -p --all --follow --reverse --
lisp/emulation/crisp.el
A crisp.el only history patch generated. However, when applying it to "git
am",
it failed at the 18th historical commit, which I have no idea why.
Another bad thing about "git am" is that it will commit "on top of" current
commit so we'll see a history like the following using "git log":
---------------------------
commit 35f5a599cf5dcb6a2a79c79048d645b48dcf043a
Author: Richard M. Stallman <rms@gnu.org>
Date: Thu Apr 10 20:43:54 1997 +0000
^^^^^^^^^^^^^^^^^^^^^^^^
Initial revision
A lisp/emulation/crisp.el
commit d31cf3156c20512f7fcf72b383827e96cfc9718e
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Jul 7 14:38:27 2014 -0400
* xpm: Fix cl-lib usage and compilation failures.
M packages/xpm/xpm-compose.el
M packages/xpm/xpm-ops.el
M packages/xpm/xpm-palette.el
M packages/xpm/xpm-ui.el
-------------------------
Gee! The history suddenly back from 2014 to 1997! I believe people won't
like this.
The filter-branch approach does not have such flaw, but it contains
some garbage info unrelated to crisp.el. However, it's not a lot, maybe
< 10% of the commits but I don't have the real number. I just randomly
checked in the history log. Seems each approach has its own pros and
cons here...
[-- Attachment #2: Type: text/html, Size: 2515 bytes --]
next prev parent reply other threads:[~2014-07-11 10:03 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
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 [this message]
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=xLRNUOeSt4HSwQzNXS1-wHDHX=Tpah2PgaT_T799McFvqRA@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).