Re: CVS files merging procedure

[Jim Hyslop]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mark Hoogenboom wrote:
> 
> In this case, can the developers solve any conflicts between the HEAD
> and the branch they are checking in to, or will that always be up to the
> check-in person? 

The latter.

> The only way I see is: the developers do the merging up
> to the actual commit and then hand over the working space to the
> check-in person to check and commit - but isn't "handing over" a
> workspace violating some CVS principles?

Well, if they hand over the CVS control files as well as the source
itself, it might work. Otherwise, that's precisely what got the OP into
the mess he's in right now.

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

iD8DBQFDnwirLdDyDwyJw+MRAuirAKD3En1ECgJEaY8mkikkKcAod4ad2wCg6T9j
05TQP7gj93okR24gnpDqM68=
=ldiH
-----END PGP SIGNATURE-----