RE: what to use to see merged files?

2003-12-17 Thread Dickson, Craig
Title: RE: what to use to see merged files? And if you follow strict tag naming conventions, ViewCVS will actual draw a line on its graphs showing you those merge points between branches. This is probably exactly what you want. -Original Message- From: Peter Connolly [mailto:[EMAIL

RE: what to use to see merged files?

2003-12-17 Thread Peter Connolly
CVS does not implicitly maintain this information. That is why it's important to follow an *explicit* tagging discipline when merging. See: http://mail.gnu.org/archive/html/info-cvs/2002-12/msg00037.html and http://mail.python.org/pipermail/spambayes-dev/2003-November/001597.html for more.

Re: what to use to see merged files?

2003-12-17 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Phil Labonte <[EMAIL PROTECTED]> writes: > I want to know if there is a windows app that will let me see visually > which files have been merged together... cvs does not maintain that information. > I have tried Tortoise, smartcvs, lincvs and wincvs