From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Paul Eggert <eggert@cs.ucla.edu>, emacs-devel@gnu.org
Subject: Re: gnulib strftime imported into Emacs
Date: Mon, 31 Jan 2011 11:56:01 -0500 [thread overview]
Message-ID: <jwv7hdl9fps.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <E1PjvB7-0003sN-Uc@fencepost.gnu.org> (Eli Zaretskii's message of "Mon, 31 Jan 2011 09:56:29 -0500")
> It may still be possible to recover the lost information, by
> temporarily restoring the old src/strftime.c and then using "bzr mv"
> to replace it with the gnulib version. If someone knows how to do
> that off-hand, please post the recipe.
I've done just that in the following way:
% bzr merge -r 103037..103036
% bzr revert <everything except {src,lib}/strftime.c
% cp lib/strftime.c lib/strftime.c.gnulib
% bzr rm lib/strftime.c
% bzr mv src/strftime.c lib/strftime.c
% mv lib/strftime.c.gnulib lib/strftime.c
% bzr commit
-- Stefan
next prev parent reply other threads:[~2011-01-31 16:56 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-30 23:43 gnulib strftime imported into Emacs Paul Eggert
2011-01-31 4:00 ` Eli Zaretskii
2011-01-31 8:02 ` Paul Eggert
2011-01-31 9:44 ` joakim
2011-01-31 9:59 ` Miles Bader
2011-01-31 10:16 ` joakim
2011-01-31 10:31 ` Miles Bader
2011-01-31 11:27 ` Eli Zaretskii
2011-01-31 11:06 ` Eli Zaretskii
2011-01-31 14:30 ` Tom Tromey
2011-01-31 14:43 ` Eli Zaretskii
2011-01-31 19:49 ` Eli Zaretskii
2011-01-31 22:19 ` Paul Eggert
2011-01-31 22:29 ` Lennart Borgman
2011-01-31 23:57 ` Paul Eggert
2011-02-01 0:15 ` Lennart Borgman
2011-02-01 0:24 ` Paul Eggert
2011-02-01 0:34 ` Lennart Borgman
2011-02-01 4:05 ` Eli Zaretskii
2011-02-01 7:08 ` Paul Eggert
2011-02-01 8:58 ` Avoiding slowdown in trunk development (was: gnulib strftime imported into Emacs) Eli Zaretskii
2011-02-01 19:04 ` Avoiding slowdown in trunk development Paul Eggert
2011-02-01 19:54 ` Lennart Borgman
2011-02-01 19:57 ` Eli Zaretskii
2011-02-02 16:52 ` Chong Yidong
2011-01-31 11:17 ` gnulib strftime imported into Emacs Lennart Borgman
2011-01-31 11:37 ` Eli Zaretskii
2011-01-31 11:52 ` Lennart Borgman
2011-01-31 13:01 ` Eli Zaretskii
2011-01-31 13:17 ` Andreas Schwab
2011-01-31 14:44 ` Eli Zaretskii
2011-01-31 14:54 ` Andreas Schwab
2011-01-31 15:14 ` Eli Zaretskii
2011-01-31 13:18 ` Lennart Borgman
2011-01-31 14:45 ` Eli Zaretskii
2011-01-31 19:50 ` Eli Zaretskii
2011-01-31 11:32 ` Andy Moreton
2011-01-31 19:53 ` Eli Zaretskii
2011-01-31 14:56 ` Eli Zaretskii
2011-01-31 16:56 ` Stefan Monnier [this message]
2011-01-31 20:06 ` Eli Zaretskii
2011-01-31 20:42 ` Stefan Monnier
2011-01-31 19:54 ` Eli Zaretskii
2011-01-31 23:25 ` Paul Eggert
2011-02-01 4:07 ` Eli Zaretskii
2011-02-01 6:25 ` Paul Eggert
2011-02-01 8:32 ` Eli Zaretskii
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=jwv7hdl9fps.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=eggert@cs.ucla.edu \
--cc=eliz@gnu.org \
--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).