RE: How well does CVS handle other types of data?

[Noel L Yap]

What's the difference?  In either case you'll have to handle the merge on your
own.

What about binary files for which there already exists a merge algorithm (eg
Word docs)?

Noel


|--------+----------------------->
|        |                       |
|        |          address@hidden|
|        |                       |
|        |          07/11/2001   |
|        |          04:07 PM     |
|        |                       |
|--------+----------------------->
  >----------------------------------------------------------------------------|
  |                                                                            |
  |       To:     address@hidden                                             |
  |       cc:     (bcc: Noel L Yap)                                            |
  |       Subject:     RE: How well does CVS handle other types of data?       |
  >----------------------------------------------------------------------------|






I think there's a major difference between datatypes that are occasionally
difficult to automatically merge (source code) and datatypes that are
fundamentally unmergable (bitmaps).

> -----Original Message-----
> From: address@hidden [mailto:address@hidden Behalf Of
> Noel L Yap
> Sent: Wednesday, July 11, 2001 3:28 PM
> To: address@hidden
> Cc: address@hidden
> Subject: Re: How well does CVS handle other types of data?
>
>
> Not only that, but CVS does't handle code reformats elegantly at all.
> Philosophically, this means that CVS can't merge source code under all
> conditions.  Does this mean you shouldn't use it when such tasks
> can occur?  Of
> course not,  All it means is that these situations need to be
> controlled so that
> CVS is usable (eg minimize their occurrence and ensure others
> know that it's
> going on).  Even if the situation is cotrolled, there's still a
> chance that you
> have a massive manual merge to do (eg when branches are
> involved).  Does this
> mean that one should never do code reformats?
>
> I guess this is the real argument -- it's not whether the files
> are text or
> binary, it's whether they're mergable or not.  Ideally (and this has been
> discussed before), CVS would allow hooks for diff/merge engines.
> You could then
> supply such an engine for, say, Java code, and refomat as you desire.


_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs




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 Chase & Co., its
subsidiaries and affiliates.