Hi there, during a merge (from branch to HEAD) I got the following error message (concerns a lot of files): --------------------------- ... cvs server: PositionOffset.xml: permission mismatch between 1.1 and 1.1.2.1 cvs server: nonmergeable file needs merge cvs server: revision 1.1.2.1 from repository is now in config/scan/PositionOffset.xml cvs server: file from working directory is now in .#PositionOffset.xml.1.1 C config/scan/PositionOffset.xml ... ----------------------------
Where does this message come from? My first thought was: the original file was write-protected before merge - but this wasn't true (In a second merge-attempt I recursively removed all write-protection flags before merge, but the effect was the same) Perhaps it might have to do with some cvs edit/ cvs unedit actions I performed with CVS on the files. Any idea when this message occurs - and what to do to avoid it? Thanks Johannes -- COMPUTERBILD 15/03: Premium-e-mail-Dienste im Test -------------------------------------------------- 1. GMX TopMail - Platz 1 und Testsieger! 2. GMX ProMail - Platz 2 und Preis-Qualit�tssieger! 3. Arcor - 4. web.de - 5. T-Online - 6. freenet.de - 7. daybyday - 8. e-Post _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
