diff options
| -rw-r--r-- | gnu/usr.bin/cvs/cvs/update.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/usr.bin/cvs/cvs/update.c b/gnu/usr.bin/cvs/cvs/update.c index d564f64..f45c1a9 100644 --- a/gnu/usr.bin/cvs/cvs/update.c +++ b/gnu/usr.bin/cvs/cvs/update.c @@ -1022,8 +1022,9 @@ join_file (file, srcfiles, vers, update_dir, entries) } } - /* skip joining identical revs */ - if (strcmp (rev2, vers->vn_user) == 0) /* no merge necessary */ + /* skip joining identical revs or if the file is not present */ + if (vers->vn_user == NULL || + strcmp (rev2, vers->vn_user) == 0) /* no merge necessary */ { free (rev2); return; |
