ID:	6812	Fixed in:
Issue Date:	2015-02-20 10:54 AEST	Owner:	CVS Support
Last Modified:	2015-02-20 10:54 AEST	Reporter:	Arthur Barrett
Current Est.	0.0 hours	% Complete:	0.0
Status:	NEW /	Severity:	enhancement

Affected:	2.8.02
Description:	enh: 'cvs status' could show if there is a merge conflict

Actions:

2015-02-20 10:54 AEST by Arthur Barrett - Apparently SVN does a 'test merge' with 'status' to determine if there are any potential conflicts.

Would it be easy to add this option to 'cvs status'?

I assume that 'cvs status' sends a copy of the local file to the server, to determine if it is 'locally modified'.  
Whatever function returns that result could also determine 'conflict'???

Query page