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