Do not allow checkin if there is a merge

( CVSSCC , VS .NET, Latest, WIN 2000/XP, CVS NT 2.0.x )

Type: Public Status:Closed Created: 23 Nov 04 11:00 Updated: 24 Nov 04 11:00

--> Igor Pushkov (admin) at 24 Nov 04 11:00 writes

Well, if you not like merge on checkin just perform "Get latest
version" before checking. All merges will occur on that step and you
will be able to validate all changes. Follow up check-in should go
without merges.

--> doug (user) at 23 Nov 04 11:00 writes

Hi,

We were wondering if there is a way to configure CVSNT or PushOK Plugin to
not allow checkin if there is a successful merge. Currently if we checkin
and there is a detected merge requirement by cvs, the merge is performed
and checkin continues. However, this is dangerous in that the newly merged
file has not been proven to be compiled. This results in us having checked
in files to the repository that do not compile.

We have tried checking the options
Check server for file status -> Determine Need Update or out of sync

but this does not perform the desired functionality.

Is there an option that we can set that would give us this functionality?

Thanks
Justin Heimer

Rate this ticket:

Not useful at all

Partially useful

Useful

Very useful

Ticket

Do not allow checkin if there is a merge