Re: conflict on added files

[Paul Edwards]

"Derek Robert Price" <derek@ximbiot.com> wrote in message 
news:mailman.7663.1055260417.21513.bug-cvs@gnu.org...
> >+     conflict)
> >+         # Test Conflict
> >+         mkdir ${CVSROOT_DIRNAME}/aaa
> >+         ${testcvs} checkout aaa >/dev/null 2>&1
> >+         cd aaa
> >+         echo aaa >one.c
> >+         ${testcvs} add one.c >/dev/null 2>&1
> >+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
> >+         rm one.c
> >+         ${testcvs} remove one.c >/dev/null 2>&1
> >+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
> >+         ${testcvs} update -j 1.2 -j 1.1 one.c >/dev/null 2>&1
> >+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
> >+         ${testcvs} tag -r 1.2 tag1 one.c >/dev/null 2>&1
> >+         ${testcvs} tag -r 1.3 tag2 one.c >/dev/null 2>&1
> >+         echo bbb >>one.c
> >+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
> >+         ${testcvs} update -j tag1 -j tag2 one.c >/dev/null 2>&1
> >+
> >+         dotest_fail conflict-1 "${testcvs} commit -m test one.c" \
> >+ "${PROG} [a-z]*: Up-to-date check failed for .one.c'
> >+ ${PROG} \[[a-z]* aborted\]: correct above errors first!"
> >+         cd ..
> >+         rm -fr aaa
> >+         rm -fr ${CVSROOT_DIRNAME}/aaa
> >+         ;;
>
> I haven't studied this enough to be certain what you were aiming for,
> but CVS certainly shouldn't be reporting that one.c is not up-to-date.

Yes it should, that's what I'm aiming for, a refusal to do a commit
after a join, where the join appeared to be a "has been added".

>  The update previous to your conflict-1 test should have reported a
> conflict,

Which it does.

> but everything is up-to-date.

It's an unresolved conflict, timestamp hasn't changed.  I want to
ensure it won't allow me to commit because of that.  I am not
concerned about the reporting of a conflict in the update, I am
concerned about CVS remembering that there was a conflict,
and refusing to do a commit.

> Also, please test the result of all CVS invocations in sanity.sh, not
> just the last few.

I noticed you doing that.  Why do you do that, they're just
junk setup commands, no?

BFN.  Paul.