(I already sent this to support at perforce.com, but I mistyped the user-list
alias, so here it is again.)
We are merging our development efforts with another team. We are trying to
convince them that Perforce has better merging tools, but they won't accept
our word! This question below was posed to us.
Separately, I would like some additional background info on an
observation made in the last meeting that the 'per-file' merging
operation in Perforce is much better than either 'cvs update' or
'patch'. Can you or someone on your team provide a set of three
files that clearly shows this superiority?
In other words:
base
/ \
chg1 chg2
where chg1 and chg2 have conflicts between them that Perforce either
handles completely or nearly completely and that 'cvs update' or
'patch' cannot justify?
(Yes, 'patch' is used with 'cvs'; I know that it's not needed in Perforce.)
IMHO, this is a trivial case, and the "power of Perforce" comes through when
there are much more complicated branching and merging going on. Not just
when trying to resolve conflicts between single revisions within a file.
Is there an example where a "non-trivial" example becomes trivial?
Thanx,
3 messages in com.perforce.perforce-user[p4] FW: Trying to convince another g...