[Top][All Lists]

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

Re: Merge issue using client 1.11.21 and server 1.11.17

From: Jim Hyslop
Subject: Re: Merge issue using client 1.11.21 and server 1.11.17
Date: Sat, 03 Jun 2006 23:22:08 -0400
User-agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)

Hash: SHA1

Jensen, Chris wrote:
> Actually, I was able to reproduce the issue.  It's not user error as
> there were not conflicts checked into CVS before the merge.

OK, that's good. Er, good that you're able to reproduce the error, that
is :=)

> Executing the same steps and only changing the client version produces
> two different results.

Can you please post the exact command sequence you're issuing?

> Conflicts exist in the sandbox but not in the
> repository with the 1.11.21 client, there's no notification about the
> conflicts when checking in the merged files, but the conflicts are never
> committed.  The files with conflicts remain in the pre-merge state in
> the repository.

How do you know there are conflicts? After the merge but before
committing, what does 'cvs status -v' show on one of the conflicting
files? What about 'cvs diff'?

Detailed information (without getting too verbose) will greatly help
diagnose the problem.

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org


reply via email to

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