[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 11:23:03 +0200
User-agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.1 (gnu/linux)

Jason Rumney <address@hidden> writes:

> Andreas Schwab wrote:
>> 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 bran
> I don't see why a file should be marked dead before it is even born.

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.

> Commands such as "cvs update -rEMACS_22_BRANCH -D2007-06-14"
> and "cvs update -rEMACS_22_1" still work as they should without
> cluttering the repository with redundant versions of files.

Now try -rEMACS_22_BRANCHPOINT.  The file magically appears before it
was even created.


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]