Re: join not producing conflict

[Derek Robert Price]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Paul Edwards wrote:

|"Derek Robert Price" <derek@ximbiot.com> wrote in message
news:mailman.2220.1066841650.21628.bug-cvs@gnu.org...
|
|>|>>Paul? If you have a suggestion for a write-up proposal to send to
|>|>>info-cvs, I would love to read it. :-)
|>|>
|>|>Hello info-cvs.
|>|
|>|
|>|If you attempt to issue a cvs update -j xxx -j yyy where
|>|yyy is the head, cvs currently ignores the command,
|>
|>This one is pretty good, but instead of `head', you should use `base'.
|
|
|I normally use the word "base" to refer to xxx.  The common
|ancestor is the base.  I guess in CVS that is called "root"?


"base" is already pretty entrenched in CVS speak.  It is the revision
the files in the sandbox are currently "based" on from the last
checkout.   You'll find that throughout the comments in the code and in
the manual.  "BASE" is also a special tag that means just that.  i.e.
`cvs diff -rBASE' should be equivalent to `cvs diff' in a sandbox.

The "root revision" of a branch in CVS speak is the revision the branch
is based on in its parent.  The common ancester is usually referred to
as the "greatest common ancester", or "GCA".  That GCA of a revision on
a branch and a revision on a branch rooted in that branch can be the
same as the "root revision", but isn't always.

Please see the Cederqvist for more.  This is all covered there.

Derek

- --
~                *8^)

Email: derek@ximbiot.com

Get CVS support at <http://ximbiot.com>!
- --
Duct tape is like the Force.  It has a light side, a dark side, and it
holds the Universe together.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQE/ma7rLD1OTBfyMaQRAtTcAKC9kDWtlpmt5o5RvTaCfVU5tJbXZwCgpmfW
zIv+83lMVffjEQEFScuER5M=
=kMLr
-----END PGP SIGNATURE-----