-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Harald Dunkel wrote: > Sorry, I missed to mention that I have this problem only for a > few files. All files in my directory had been merged between > 2 branches (!= HEAD) several times. Most files are silently > skipped on the second merge. Only a few files became "dirty" > somehow. > > >>By the way, the better list for this type of question is >>[EMAIL PROTECTED] >> > > > Sorry, I did not knew this mailing list. But isn't this > unpredictable behavior a bug, anyway?
*If* it truly is unpredictable, then yes, it may be a bug. What you're observing may be perfectly predictable if we understand the entire context in which it's happening. Let's have a closer look at the files that suffer from this. Is it the same files every time you merge, or is it a different set of files each time? Do these files have anything in common, such as (but not limited to): location? size? presence or lack of RCS keywords such as $Id$? keyword expansion mode, i.e. -k option (binary or text)? After the second merge and before committing, examine the output of 'cvs diff.' Can you consistently reproduce the problem? If so, can you provide us instructions on how to reproduce it in our own repositories? - -- Jim Hyslop Dreampossible: Better software. Simply. http://www.dreampossible.ca Consulting * Mentoring * Training in C/C++ * OOD * SW Development & Practices * Version Management -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFEPxTdLdDyDwyJw+MRAlKpAJ9X8NwKk5IlwQiuFlWyLhA+wxIOPwCfZFEe i2inOkNpjhuUxbo/+Z4qHZE= =Gq45 -----END PGP SIGNATURE----- _______________________________________________ Bug-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/bug-cvs
