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

[Mark D. Baushke]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Are you able to give us a step-by-step reproducable test case?

If you look in the CVS/Entries file does the entry for your conflicted
file have something that looks like this line:

/filename/1.30/Result of merge+Fri Jun  2 07:40:30 2006//

before and after the final 'cvs update' ?

        -- Mark

Stephanie Seibt <address@hidden> writes:

> I can reproduce a similiar behavior if i do a join from a branch. The
> output messages shows conflicts, but if i do a cvs -n update no
> conflicts were displayed.
> 
> Environment: remote server cvs-1.12.9 (Debian-patch, should be equal
> to cvs-1.12.13), pserver access, client cvs-1.12.13 for Windows
> (downloaded from gnu.org)
> 
> With client cvs-1.11.17 for Windows everything works fine.
> 
> Greetings Stephanie
> 
> Jim Hyslop schrieb:
> > Mark D. Baushke wrote:
> >> 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.
> > I tried it as well, and can't reproduce it. A similar issue was also
> > recently reported in the stable branch (see
> > http://lists.gnu.org/archive/html/bug-cvs/2006-05/msg00048.html) I'm
> > wondering if there's a configuration issue somewhere?
> > Steve, can you please provide details about your environment
> > (platform;
> > local or remote repository; if remote, what version of the server is it
> > and connection method; any other details which you may feel are
> > relevant)? Did you build the binaries from source, or download a binary
> > from somewhere?
> > Also, can you try reproducing the problem using just 1.12.13 on a
> > brand-new file in a clean working directory? I'm wondering if 1.12.9
> > leaves some cruft in the CVS/ directory that confuses 1.12.13.
> > --
> > Jim Hyslop
> > Dreampossible: Better software. Simply.     http://www.dreampossible.ca
> >                  Consulting * Mentoring * Training in
> >     C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (FreeBSD)

iD8DBQFEf+tPCg7APGsDnFERAg/dAKCilQ3oyz8GtM+8ASckAm0MPMDa8QCdFmh5
7PYb+9sCLVATGIvHAQkjS24=
=Zz5B
-----END PGP SIGNATURE-----