Re: Missing file in EMACS_22_BASE (GIT repo)

[Andreas Schwab <schwab@suse.de>]

Jason Rumney <jasonr@gnu.org> writes:

> Andreas Schwab wrote:
>> It isn't.  The file exists, but only on one branch.  When it is added to
>> a different branch there needs to be a way to tell that the file didn't
>> exist before that point on that branch.  That's the way CVS works.  The
>> current situation cannot have been created without rewriting history.
>>   
> The creation date of that file is what tells that it didn't exist before
> then.

That is only true for the trunk.  On a branch, there is *always* an
extra commit with the automatically generated commit message "file
... was initially added on branch ..." (optionally followed by the date
of the merge when the file was first added on the trunk).

> This is no different on a branch than the trunk. I think you are
> thinking of the way git or arch works, not the way CVS works. In CVS,
> files branch, not repositories.

The current situation cannot be created without directly manipulating
the branch tag.

>> Now try -rEMACS_22_BRANCHPOINT.  The file magically appears before it
>> was even created.
>>   
> The EMACS_22_BRANCHPOINT tag is supposed to be there as an aid to
> automated merging.

No.  The tag is supposed to represent the branch point exactly.

> The other branchpoint tags such as emacs-unicode-2-base also present
> the same problem,

The emacs-unicode-2-base tag is indeed a moving tag.

> regardless of the fact that those branches contain a redundant
> deletion and readdition of the file.

They are not redundant, those revisions are a direct result by the use
of proper CVS operation.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
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."