1 # Undo not flagging conflicted copies anymore, as reported by
2 # Henrique de Moraes Holschuh <hmh@debian.org>
4 # Fix as described in message to the CVS mailing list at
5 # http://lists.gnu.org/archive/html/info-cvs/2006-06/msg00050.html
6 --- cvs-1.12.13/src/client.c~ 2005-10-02 16:17:20.000000000 +0100
7 +++ cvs-1.12.13/src/client.c 2006-06-09 20:12:06.000000000 +0100
9 /* File no longer exists. Don't do anything, missing files
12 - else if (!vers->ts_rcs || args->force
13 - || strcmp (vers->ts_conflict
14 - ? vers->ts_conflict : vers->ts_rcs, vers->ts_user)
15 - || (vers->ts_conflict && !strcmp (cvs_cmd_name, "diff")))
16 + else if (vers->ts_rcs == NULL
18 + || strcmp (vers->ts_user, vers->ts_rcs) != 0)
21 && supported_request ("Is-modified"))