RE: Merge issue using client 1.11.21 and server 1.11.17

[Jensen, Chris]

We knew there should be conflicts in the merge.  With a merge
the size we were doing, we expected about a dozen conflicts.

Attempting to use the merged code also did not work.

Doing 'cvs diff' reported nothing, so we decided to grep for
the diff markers and found the conflicts in files that were
different than the repository version.  Then we understood we
had a weird issue, since 'cvs diff' and other commands would
not identify that the files differed from the repository.

We were doing a merge of an old branch into a new branch that
was based on a tag of our latest production release.

I've done dozens of these merges without running into a 
similar issue.

The command sequence is like this:

      cvs co <module>
      cd <module>
      cvs up -dPr <branch-point-tag>
      cat CVS/Tag     (make sure you're on the branch point)
      cvs tag -b <new-branch-name>
      cvs up -dPr <new-branch-name>
      cat CVS/Tag     (make sure you're on the new branch)
      cvs up -kk -dj <old-branch-name>
      cvs -n up > <merge-manifest-name>

    * Examine the merge manifest, making note of (A)dditions and (C)onflicts. 
    * Remove resurrected files (A's which are dead on the branch point).
    * Resolve merge conflicts (diffs in the C's).
    * Commit the new branch. 

      cvs commit -m 'comment'

-Chris


-----Original Message-----
From: Jim Hyslop [mailto:jhyslop@dreampossible.ca]
Sent: Saturday, June 03, 2006 8:22 PM
To: Jensen, Chris
Cc: Steve McIntyre; bug-cvs@nongnu.org
Subject: Re: Merge issue using client 1.11.21 and server 1.11.17


-----BEGIN PGP SIGNED MESSAGE-----
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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEglHgLdDyDwyJw+MRAu35AJ4+Vdv0/GqOd0XaX5oP73Vy+BASKQCfYjgS
XwMKUeZxl+09jut+wTggR1g=
=H60i
-----END PGP SIGNATURE-----