[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: Fri, 02 Jun 2006 15:18:55 -0400
User-agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)

Hash: SHA1

Jensen, Chris wrote:
> I ran into a strange issue trying to do a merge.
Chris, sorry to take so long to get back to you on this.

> Using the 1.11.21 client delivered with Fedora Core 5
> and a server running 1.11.17 (using pserver), cvs would
> not identify merge conflicts.
> Grepping through the merged files found the conflicts.
> The client also allowed committing without resolving the
> conflicts, but the files with conflicts were not committed.

> No warnings or errors were displayed.  Commits of those
> files with conflicts simply resulted in a no-op, as if there
> were no differences.  CVS diffs also showed no differences
> when they did exist.

I suspect user error in this case.

This suggests that the conflict markers were checked into the
repository, and as such did not really create conflicts on your local
directory. Check out the pre-merged revision of the file into a fresh
directory. For example, if the update command brought your file to rev
1.23, and committing it brought it to 1.24, check out rev 1.23. If the
file contains the merge markers, then it was user error on the part of
the person who checked in rev 1.23 (or whichever rev. in which the
markers first appeared).

- --
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]