[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Missing file in EMACS_22_BASE (GIT repo)

From: Andreas Schwab
Subject: Re: Missing file in EMACS_22_BASE (GIT repo)
Date: Fri, 05 Oct 2007 01:18:19 +0200
User-agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.1 (gnu/linux)

Jason Rumney <address@hidden> writes:

> Andreas Schwab wrote:
>> 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.
> It was added to the branches by tagging, which is the proper way to do
> such things in CVS.

The file didn't exist yet when the EMACS_22_BASE branch was created.

> It seems it was then deleted from the other branches and re-added,

This is done automatically by CVS when merging a new file from a
different branch.  This makes sure the file is marked dead before the
merge.  This revision is missing for the EMACS_22_BASE branch.


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."

reply via email to

[Prev in Thread] Current Thread [Next in Thread]