diff options
| author | David Greenman <dg@FreeBSD.org> | 1995-09-17 06:37:42 +0000 |
|---|---|---|
| committer | David Greenman <dg@FreeBSD.org> | 1995-09-17 06:37:42 +0000 |
| commit | 4538598dfc9f5b2b6c3efdf6b6fc8ac6307b4afe (patch) | |
| tree | 8c1f16eace3cf4164af2d879cc3a066ae8741dea /gnu/usr.bin | |
| parent | 448adbf13b2844511831b688e0138d0e149d6809 (diff) | |
Notes
Diffstat (limited to 'gnu/usr.bin')
| -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 d564f6432d29..f45c1a932055 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; |