Re: Missing file in EMACS_22_BASE (GIT repo)

[Andreas Schwab]

Andreas Schwab <address@hidden> writes:

> Jim Meyering <address@hidden> writes:
>
>> dhruva <address@hidden> wrote:
>>> On 10/4/07, Jim Meyering <address@hidden> wrote:
>>>> dhruva <address@hidden> wrote:
>>>> >  I am using the GIT repo. I am not finding the emacs.manifest file
>>>> > under the 'emacs/nt' folder. The build (MinGW) on XP needs it. I just
>>>> > copied it from the HEAD and the build went fine. I am able to see this
>>>> > file in the ViewCVS frontend under the EMACS_22_BASE branch. I am
>>>> > guessing something might have gone wrong in the GIT repository.
>>>>
>>>> If you don't have it, then perhaps you removed it or interrupted the clone.
>>>> It's certainly in my copy (obtained via git clone 
>>>> git://git.sv.gnu.org/emacs):
>>>
>>> Strange.. I do not see it in the gitweb either:
>>> http://git.sv.gnu.org/gitweb/?p=emacs.git;a=tree;f=nt;h=844d19ca974ab7b2b505ef21f77b138862c7e4ad;hb=EMACS_22_BASE
>>
>> I see what you mean, now.
>> I missed the part about "on a branch".
>
> That looks like a bug in cvsps, it is already missing from its output.

Looking closer the situation is more complicated.  The file was added to
the trunk on 2007-06-15, but the EMACS_22_BASE branch was cut on
2007-04-27.  There is no indication in the RCS file how the file was
added to the EMACS_22_BASE branch (unlike the emacs-unicode-2,
multi-tty, unicode-xft and lexbind branches, which have explicit
revisions for the merges).  It looks like the history of the file has
been modified after the fact, and neither cvsps nor git-cvsimport can be
blamed here.

Andreas.

-- 
Andreas Schwab, SuSE Labs, address@hidden
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."