[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

update -A removes conflict

From: Susanne Bertling
Subject: update -A removes conflict
Date: Tue, 22 Aug 2006 17:22:11 +0200

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

Der GMX SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen!
Ideal für Modem und ISDN: http://www.gmx.net/de/go/smartsurfer

reply via email to

[Prev in Thread] Current Thread [Next in Thread]