[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Emacs trunk
From: |
Stefan Monnier |
Subject: |
Re: Emacs trunk |
Date: |
Fri, 03 Dec 2010 17:07:44 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
>> 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