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

[Stephanie Seibt]

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:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> 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.2 (MingW32)
> Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
>
> iD8DBQFEf7B8LdDyDwyJw+MRAnJ4AJ0SYzqf09ZS6Q2GThnp7T2hU7dk9ACePO5z
> /MQFgNgsgg+KSXw3B8YaWXo=
> =VqfI
> -----END PGP SIGNATURE-----
>
>
>
> _______________________________________________
> info-cvs mailing list
> address@hidden
> http://lists.nongnu.org/mailman/listinfo/info-cvs