-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Jensen, Chris wrote: > Actually, I was able to reproduce the issue. It's not user error as > there were not conflicts checked into CVS before the merge.
OK, that's good. Er, good that you're able to reproduce the error, that is :=) > Executing the same steps and only changing the client version produces > two different results. Can you please post the exact command sequence you're issuing? > Conflicts exist in the sandbox but not in the > repository with the 1.11.21 client, there's no notification about the > conflicts when checking in the merged files, but the conflicts are never > committed. The files with conflicts remain in the pre-merge state in > the repository. How do you know there are conflicts? After the merge but before committing, what does 'cvs status -v' show on one of the conflicting files? What about 'cvs diff'? Detailed information (without getting too verbose) will greatly help diagnose the problem. - -- 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 iD8DBQFEglHgLdDyDwyJw+MRAu35AJ4+Vdv0/GqOd0XaX5oP73Vy+BASKQCfYjgS XwMKUeZxl+09jut+wTggR1g= =H60i -----END PGP SIGNATURE----- _______________________________________________ Bug-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/bug-cvs
