[Top][All Lists]

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

RE: what to use to see merged files?

From: Peter Connolly
Subject: RE: what to use to see merged files?
Date: Wed, 17 Dec 2003 12:54:03 -0800

CVS does not implicitly maintain this information. That is why it's important 
to follow an *explicit* tagging discipline when merging.  See:


for more.  

For example, you might tag all your merge sources as MERGESOURCE_<date>,
or MERGESOURCE_<branch>_<date> or whatever.  
Tag your targets with something similar so that it's easy to match source and 

In any case, it's important for your organization to have a set of branch and 
merge tagging standards so that this information can be tracked.  CVS won't do 
it for you.

> -----Original Message-----
> From: address@hidden 
> [mailto:address@hidden On 
> Behalf Of Phil Labonte
> Sent: Wednesday, December 17, 2003 12:15 PM
> To: address@hidden
> Subject: what to use to see merged files?
> I want to know if there is a windows app that will let me see 
> visually 
> which files have been merged together...
> I have tried Tortoise, smartcvs, lincvs and wincvs all of them have a 
> revision graph but they do not show in the graph which to files have 
> been merged.
> For instance... I have a file called filt.txt and I make 2 
> revisions so 
> main is revision 1.3, from the 1.3 revision I branch of to 
> then 
> I make two revisions off the brached version and say I am now 
> at
> Now that I am done and I merge the version back into the main 
> brach 1.3 to end up with 1.4. If  I do the revision graph I 
> do not see a 
> link from 1.3 to Is there a way to see it?
> Thanks
> _______________________________________________
> Info-cvs mailing list
> address@hidden

reply via email to

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