Re: Major change in conflict handling between 1.12.9 and 1.12.13?

[Mark D. Baushke]

Hi Steve,

I added the following patch to the cvs-1.12.13/src/sanity.sh to try to
test your problem. I am still unable to reproduce your error.

Does running

  sh sanity.sh `which cvs-1.12.13` conflicts4

work for you or not?

        Thanks,
        -- Mark

--- sanity.sh.orig      2005-09-22 13:34:06.000000000 -0700
+++ sanity.sh   2006-06-01 16:37:17.921668994 -0700
@@ -1634,7 +1634,7 @@ if test x"$*" = x; then
        tests="${tests} join join2 join3 join4 join5 join6 join7"
        tests="${tests} join-readonly-conflict join-admin join-admin-2"
        tests="${tests} join-rm"
-       tests="${tests} new newb conflicts conflicts2 conflicts3"
+       tests="${tests} new newb conflicts conflicts2 conflicts3 conflicts4"
        tests="${tests} clean"
        tests="${tests} keywordexpand"
        # Checking out various places (modules, checkout -d, &c)
@@ -12101,6 +12101,47 @@ new revision: delete; previous revision:
 
 
 
+       conflicts4)
+         mkdir 1; cd 1
+         dotest conflicts4-1 "$testcvs -q co -l ."
+         mkdir first-dir
+         dotest conflicts4-2 "${testcvs} add first-dir" \
+"Directory ${CVSROOT_DIRNAME}/first-dir added to the repository"
+         cd ..
+         mkdir 2; cd 2
+         dotest conflicts4-3 "${testcvs} -q co -l first-dir" ''
+         cd ../1/first-dir
+         echo baseline >file1
+         dotest conflicts4-4 "${testcvs} -q add file1" \
+"${SPROG} add: use .${SPROG} commit. to add this file permanently"
+         dotest conflicts4-5 "${testcvs} -q ci -m add-it" \
+"$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
+initial revision: 1\.1"
+         cd ../../2/first-dir
+         dotest conflicts4-6 "${testcvs} -q update" "U file1"
+         # Make a local change
+         echo wibble2 >> file1
+         dotest conflicts4-7 "${testcvs} -q ci -m update2" \
+"$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
+new revision: 1\.2; previous revision: 1\.1"
+         cd ../../1/first-dir
+         echo wibble1 >>file1
+         dotest conflicts4-8 "${testcvs} -Q update" \
+"RCS file: $CVSROOT_DIRNAME/first-dir/file1,v
+retrieving revision 1\.1
+retrieving revision 1\.2
+Merging differences between 1\.1 and 1\.2 into file1
+rcsmerge: warning: conflicts during merge
+cvs update: conflicts found in file1"
+         dotest_fail conflicts4-9 "${testcvs} -q update" \
+"C file1"
+         
+         dokeep
+         cd ../..
+         rm -rf 1 2
+         modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
+         ;;
+
        clean)
          # Test update -C (overwrite local mods w/ repository copies)
          mkdir 1; cd 1

 ------- original message -------
Date: Thu, 1 Jun 2006 21:57:19 +0100
From: Steve McIntyre <address@hidden>
To: info-cvs <address@hidden>
Subject: Re: Major change in conflict handling between 1.12.9 and 1.12.13?

On Thu, Jun 01, 2006 at 12:38:12PM -0700, Mark D. Baushke wrote:
>Could you provide a recipe for how to reproduce this problem exactly?
>
>I tried a few simple things without finding the problem you describe.

Well, my original mail described the problem I thought.

Checkout the same source tree into two sandboxes. Then edit one file
in both, making incompatible changes (e.g. append a different line to
each) on the same line of that file. Check one of them in, then run
cvs update on the other and look for the conflict and how it's
retained (or not).

tack:/tmp$ echo "wibble" >>seyon/Seyon.c
tack:/tmp$ echo "wibble1" >>seyon1/Seyon.c
tack:/tmp$ cvs-1.12.9 -q ci -m "1.12.9 test" seyon/Seyon.c
/home/cvs/seyon/Seyon.c,v  <--  seyon/Seyon.c
new revision: 1.31; previous revision: 1.30
tack:/tmp$ cd seyon1/
tack:/tmp/seyon1$ cvs-1.12.9 -q up
RCS file: /home/cvs/seyon/Seyon.c,v
retrieving revision 1.30
retrieving revision 1.31
Merging differences between 1.30 and 1.31 into Seyon.c
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in Seyon.c
C Seyon.c
tack:/tmp/seyon1$ cvs-1.12.9 -q up
C Seyon.c

<clean up, regenerate test trees>

tack:/tmp$ echo "wibble" >>seyon/Seyon.c
tack:/tmp$ echo "wibble1" >>seyon1/Seyon.c
tack:/tmp$ cvs-1.12.13 -q ci -m "1.12.13 test" seyon/Seyon.c
/home/cvs/seyon/Seyon.c,v  <--  seyon/Seyon.c
new revision: 1.32; previous revision: 1.31
tack:/tmp$ cd seyon1/
tack:/tmp/seyon1$ cvs-1.12.13 -q up
RCS file: /home/cvs/seyon/Seyon.c,v
retrieving revision 1.31
retrieving revision 1.32
Merging differences between 1.31 and 1.32 into Seyon.c
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in Seyon.c
C Seyon.c
tack:/tmp/seyon1$ cvs-1.12.13 -q up
tack:/tmp/seyon1$

I hope that's reproducible for you too!

-- 
Steve McIntyre, Cambridge, UK.                                address@hidden
"I suspect most samba developers are already technically insane... Of
 course, since many of them are Australians, you can't tell." -- Linus Torvalds