Re: Merge-Problem: nonmergeable file needs merge

[Larry Jones]

Johannes Kilian writes:
>
> cvs server: PositionOffset.xml: permission mismatch between 1.1 and 1.1.2.1

This indicates that you have enabled the notoriously buggy
PreservePermissions code.  Since that has been disabled in recent
releases of CVS, you must either be using a very old release of CVS or
you have gone out of your way to enable it.  I strongly suggest
upgrading to the current release of CVS or at least disabling it in your
CVSROOT/config file.  When PreservePermissions is enabled, CVS stores
the permissions along with each revision.  In this case, it is telling
you that revision 1.1.2.1 had different permissions than revision 1.1.

-Larry Jones

I don't NEED to compromise my principles, because they don't have
the slightest bearing on what happens to me anyway. -- Calvin