Re: Help! Forcing Visual Merge... (WinCvs)

[Larry Jones]

Marc Berenbach writes:
>  
> Basically, is there a way for CVS to detect this, and what settings
> would we need to change in WinCVS to make this possible...  I am working
> with revision 1.4 on my machine, the one on the server is 1.6, and I
> choose to commit... I want it to stop right there and prompt me to do a
> merge or proceed with the commit!

I don't know about WinCVS, but regular CVS will refuse to do the commit
at this point because the file is not up to date.  It's then your
responsibility to do an update, which will attempt to do automatic
merging, and then verify the results before re-trying the commit.

-Larry Jones

Another casualty of applied metaphysics. -- Hobbes