From: Andreas Schwab <schwab@suse.de>
To: Jason Rumney <jasonr@gnu.org>
Cc: Jim Meyering <jim@meyering.net>, Emacs Devel <emacs-devel@gnu.org>
Subject: Re: Missing file in EMACS_22_BASE (GIT repo)
Date: Fri, 05 Oct 2007 11:23:03 +0200 [thread overview]
Message-ID: <jek5q1x6dk.fsf@sykes.suse.de> (raw)
In-Reply-To: <47057BC7.9060100@gnu.org> (Jason Rumney's message of "Fri\, 05 Oct 2007 00\:48\:23 +0100")
Jason Rumney <jasonr@gnu.org> 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.
--
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."
next prev parent reply other threads:[~2007-10-05 9:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-04 12:55 Missing file in EMACS_22_BASE (GIT repo) dhruva
2007-10-04 13:04 ` Jim Meyering
2007-10-04 13:09 ` dhruva
2007-10-04 13:33 ` Jim Meyering
2007-10-04 14:07 ` dhruva
2007-10-05 4:28 ` dhruva
2007-10-05 8:01 ` Jason Rumney
2007-10-04 16:47 ` Andreas Schwab
2007-10-04 22:10 ` Andreas Schwab
2007-10-04 22:24 ` Jason Rumney
2007-10-04 23:18 ` Andreas Schwab
2007-10-04 23:48 ` Jason Rumney
2007-10-05 9:23 ` Andreas Schwab [this message]
2007-10-05 9:34 ` Jason Rumney
2007-10-05 9:59 ` Andreas Schwab
2007-10-05 10:23 ` Jason Rumney
2007-10-05 11:58 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jek5q1x6dk.fsf@sykes.suse.de \
--to=schwab@suse.de \
--cc=emacs-devel@gnu.org \
--cc=jasonr@gnu.org \
--cc=jim@meyering.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).