From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Chong Yidong <cyd@stupidchicken.com>
Cc: Katsumi Yamaoka <yamaoka@jpl.org>, emacs-devel@gnu.org
Subject: Re: Emacs trunk
Date: Fri, 03 Dec 2010 17:07:44 -0500 [thread overview]
Message-ID: <jwvlj46o6kl.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87lj467lme.fsf@stupidchicken.com> (Chong Yidong's message of "Fri, 03 Dec 2010 13:32:41 -0500")
>> I seem to have deleted some files in the Emacs bzr trunk for
>> unresolved reason at revno:102572 . I restored those files,
>> but I might have done it in a wrong way. Sorry.
>>
>> At that time I merged Gnus changes to the Emacs trunk as usual,
>> never did unusual operation. Hmm..
> You dropped the exec bit on several of the files. I've put them back,
> but could you double check? In particular, check that all the files you
> deleted and then restored have the correct permissions.
He also gave them different file-ids. So we should re-remove them and
then re-add them with "bzr add --file-ids-from" some older branch.
Or maybe just with something like "bzr merge -r 102572..102571".
Stefan
next prev parent reply other threads:[~2010-12-03 22:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-03 15:30 Emacs trunk Katsumi Yamaoka
2010-12-03 18:32 ` Chong Yidong
2010-12-03 21:41 ` Glenn Morris
2010-12-03 22:16 ` Chong Yidong
2010-12-05 12:22 ` Katsumi Yamaoka
2010-12-03 22:07 ` Stefan Monnier [this message]
2010-12-03 22:15 ` Glenn Morris
2010-12-03 22:50 ` Stefan Monnier
2010-12-03 23:13 ` Glenn Morris
2010-12-04 1:22 ` Stefan Monnier
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=jwvlj46o6kl.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=cyd@stupidchicken.com \
--cc=emacs-devel@gnu.org \
--cc=yamaoka@jpl.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).