[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Stephanie Seibt
Subject: Re: Major change in conflict handling between 1.12.9 and 1.12.13?
Date: Fri, 02 Jun 2006 09:14:06 +0200
User-agent: Thunderbird (Windows/20060308)

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 

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

With client cvs-1.11.17 for Windows everything works fine.

Greetings Stephanie

Jim Hyslop schrieb:
Hash: SHA1

Mark D. Baushke wrote:
Hi Steve,

I added the following patch to the cvs-1.12.13/src/ 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 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.
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird -


info-cvs mailing list

reply via email to

[Prev in Thread] Current Thread [Next in Thread]