Ben Keating wrote:
> Hello,
> I'm working in CVS 1.9 (over rcs 5.7) for OO project management. On Solaris
> 2.6, using tkCVS 6.3, I've locked a file. The lock works, as in nobody else
> can edit the file, however, I cannot edit it anymore either. I cannot
> unlock it either, not even directly in the repository. Any suggestions
> would be greatly appreciated. Also, when using tkCVS 6.3, scenario:
> Developer A is modifying a file in working copy, Developer B modifies the
> same file in his working copy, then commits it. Developer A now needs a
> merge. Doing a diff shows that Developer B has modified in a differing spot
> than A. However, the merge loses Developer A's changes and updates Dev. A's
> file to look like the latest version in repository. Could the automation be
> smoother and less destructive? I deeply appreciate any explanations or
> advice as I am still learning CVS and UNIX.
You might want to upgrade to 1.11. There have been a lot of enhancements and
bug fixes since 1.9.
Derek
--
Derek Price CVS Solutions Architect ( http://CVSHome.org )
mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com )
--
Thousands of years ago, cats were worshipped as gods. Cats have never
forgotten this.
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs