[Top][All Lists]

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

Re: difference between 1.1 and

From: Eric Siegerman
Subject: Re: difference between 1.1 and
Date: Mon, 23 Jun 2003 23:29:57 -0400
User-agent: Mutt/1.2.5i

On Mon, Jun 23, 2003 at 03:18:57PM -0500, Ronald Petty wrote:
> I was wondering what is the difference between 1.1 and

In the usual case, there isn't any.  If you import a new file
(one that isn't already known to CVS), the program imports it to
rev.  Ideally that would be the whole story, but the
underlying RCS file format doesn't let you create a branch
without a root.  So CVS checks in rev. 1.1 as well, and makes identical to it.

In unusual cases, the two can differ.  For example, suppose you:
  - import Version 3 of some third-party package
  - locally create a new file foo, and commit it
  - import Version 4, which contains a file foo (doesn't matter
    to this discussion whether the two are related -- though of
    course it will matter to you during the merge!)

At this point, Rev. 1.1 will contain your local version of foo,
and will contain the one from Version 4 of the package.


|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
When I came back around from the dark side, there in front of me would
be the landing area where the crew was, and the Earth, all in the view
of my window. I couldn't help but think that there in front of me was
all of humanity, except me.
        - Michael Collins, Apollo 11 Command Module Pilot

reply via email to

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