I don't know of any option per se, but you should be able to diff against the
backup copy that "cvs up" creates.
Noel
[EMAIL PROTECTED] on 06/01/2000 08:16:19 AM
To: [EMAIL PROTECTED]
cc: (bcc: Noel L Yap)
Subject: Merge with delimiters possible?
Does CVS support doing a merge that would treat not only overlapping
modifications, but also every non-overlapping modification as if it were a
conflict?
In other words, after doing a merge, the new source modules would contain
all the proposed changes in the "<<<<<<" delimiters so that I could then
scan through the source and optionally merge only what is necessary.
It looks like this type of thing is doable with third party tools, such as
Araxis Merge 2000, but I would like to know if CVS supports it directly.
I've looked through the docs, faq and man pages pretty extensively, but have
not located the option (if it exists!)
We are running CVS version 1.10.6 on a Linux server and WinCVS 1.1b13 as the
client.
TIA--
Chris
This communication is for informational purposes only. It is not intended as
an offer or solicitation for the purchase or sale of any financial instrument
or as an official confirmation of any transaction. All market prices, data
and other information are not warranted as to completeness or accuracy and
are subject to change without notice. Any comments or statements made herein
do not necessarily reflect those of J.P. Morgan & Co. Incorporated, its
subsidiaries and affiliates.
