info-cvs
[Top][All Lists]
Advanced

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

Re: Merge point confusion.


From: Derek Robert Price
Subject: Re: Merge point confusion.
Date: Tue, 04 Nov 2003 13:06:15 -0500
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030624 Netscape/7.1

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

David Wood wrote:

|I _think_ my solution is to make a tag at the point A merged to B, and
|merge FROM that tag, TO "current B." This does appear to work.
|
|What confuses me about it even more is that, after I do this, I see
|changes on Home that I made to B before the point where A was merged in!


If you are merging `TO "current B"', of course you still see the changes
you made to B.

|I fear I am misunderstanding the way CVS is deciding what to do with merge
|from and to points, and I cannot find answers to questions this specific
|in the references.
|
|Does anyone who is frighteningly familiar with merging understand what's
|going on here?


http://www.cvshome.org/docs/manual/cvs-1.12.2/cvs_5.html#SEC61

Derek

- --
~                *8^)

Email: address@hidden

Get CVS support at <http://ximbiot.com>!
- --
If you can read this, please flip me back over... (seen upside down, on
a Jeep)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQE/p+qWLD1OTBfyMaQRAq7AAJ4qgCxhHUG2zmN6CkcHHF1Vo9EefACePOn+
9081pvNjm0hqVqf/h6mlpUA=
=DaFS
-----END PGP SIGNATURE-----






reply via email to

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