Hi, I just updated from cvs 1.11.13 to 1.11.22, but now my merge process doesn't work anymore: cvs update -kk -j v3_0 -j v3_0_MERGED test.c ... rcsmerge: warning: conflicts during merge
Now cvs status show the -kk sticky option and an unresolved conflict. My merge-Skript now executes cvs update -A (to remove the sticky option -kk) but with the new version 1.11.22 I get a fresh version of test.c with no conflicts and cvs status shows that the file ist Up-to-date. cvs update -A test.c U test.c Without the -kk option the behaviour has not changed "C test.c", and the conflict is not removed. But I like the -kk option for merging. I hope I was clear enough so you can reproduce the error, if not I can provide further information. Thanks for any helpful comments Susanne -- Der GMX SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen! Ideal für Modem und ISDN: http://www.gmx.net/de/go/smartsurfer _______________________________________________ Bug-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/bug-cvs
