Re: update -A removes conflict

[Susanne Bertling]

Hi,
excuse me sending the last email twice, but my e-mail-client said there was an 
error sending the mail.

I just implemented a testcase into sanity.sh:

--- ../../cvs-1.11.22-2/src/sanity.sh   Fri Jun  9 04:09:41 2006
+++ sanity.sh   Thu Aug 24 10:34:37 2006
@@ -6793,14 +6793,12 @@
 --- 1 ----
 ! 4:br1"
          dotest branches-15 \
+           "${testcvs} update -kk -j 1.1.2.1 -j 1.1.2.1.2.1 file1" \
+           "U file1
+RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
-           "${testcvs} update -j 1.1.2.1 -j 1.1.2.1.2.1 file1" \
-           "RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
 retrieving revision 1\.1\.2\.1
 retrieving revision 1\.1\.2\.1\.2\.1
 Merging differences between 1\.1\.2\.1 and 1\.1\.2\.1\.2\.1 into file1
 rcsmerge: warning: conflicts during merge"
+          dotest_fail branches-15a "${testcvs} update -A file1" "C file1"
          dotest branches-16 "cat file1" '<<<<<<< file1
 1:ancest
 [=]======

And in check.log:

PASS: branches-15
U file1
exit status was 0
FAIL: branches-15a

Without the -kk option only adding the test case brances-15a, the test runs 
without errors.

Susanne

> 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
> -- 
> 
> 
> "Feel free" – 10 GB Mailbox, 100 FreeSMS/Monat ...
> Jetzt GMX TopMail testen: http://www.gmx.net/de/go/topmail
> 
> 
> _______________________________________________
> Bug-cvs mailing list
> Bug-cvs@nongnu.org
> http://lists.nongnu.org/mailman/listinfo/bug-cvs

-- 


Echte DSL-Flatrate dauerhaft für 0,- Euro*. Nur noch kurze Zeit!
"Feel free" mit GMX DSL: http://www.gmx.net/de/go/dsl