[cvsnt] Re: cvsnt 2.0.19 (and 2.0.22, not 2.0.21), cvs up -C works only for :local:

[Mark Levedahl]

This feature seemed to work in 2.0.21, but is broken again in 2.0.22. I
wonder if a more direct approach might be in order in update.c. I might be
missing something obvious, but cannot fathom why cvs doesn't just get rid of
the offending file when it is identified rather than hoping some serpentine
logic will rediscover this later:

--- update.c.orig       2004-01-23 21:24:04.013377600 -0500
+++ update.c    2004-01-23 21:23:39.528169600 -0500
@@ -689,10 +689,12 @@
                                        finfo->file, bakname);
                     xfree (bakname);

-
-                    /* The locally modified file is still present, but
+                    /* Delete the locally modified file so
                        it will be overwritten by the repository copy
                        after this. */
+                    if (!server_active) {
+                        CVS_UNLINK(finfo->file);
+                    }
                     status = T_CHECKOUT;
                     retval = checkout_file (finfo, vers, 0, 0, 1, 0, 0);
                 }

Mark

"Tony Hoyle" <tmh at nodomain.org> wrote in message
news:ad4jvvo7089u2m1e73cn3r43dcj6cl19fb at 4ax.com...
> OK I give up maybe it did work.. :)  - I remember when I first started
> on CVS it didn't work reliably so I just never used it since - just
> deleted and re-updated.
>
> Tony
>