Hi Jim, Jim Hyslop wrote: > > CVS assumes nothing. You *told* it to merge the same file again and > again. You may only omit the second -j option on the first merge. The > second and subsequent merges must provide both -j options. > 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? Regards Harri _______________________________________________ Bug-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/bug-cvs
