From 7381f772b53e7490bcc36da696d750524f20b35b Mon Sep 17 00:00:00 2001 From: scjones <scjones@users.savannah.nongnu.org> Date: Tue, 18 Nov 2008 19:18:16 +0000 Subject: [PATCH] Merge changes from cvs1-11-x-branch --- src/ChangeLog | 4 ++++ src/update.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1d2905a79..98edc3fc8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-11-18 Larry Jones <lawrence.jones@siemens.com> + + commit.c, update.c: Fix gcc -Wall warnings. + 2008-11-18 Larry Jones <lawrence.jones@siemens.com> * sanity.sh: Fix nonportable ``date +%s'' test. diff --git a/src/update.c b/src/update.c index af051d513..94fb1ee7f 100644 --- a/src/update.c +++ b/src/update.c @@ -2196,7 +2196,7 @@ join_file (struct file_info *finfo, Vers_TS *vers) || /* destination branch modified in repository */ !STREQ (rev1, vers->vn_user) || /* locally modified */ - vers->ts_user && !STREQ (vers->ts_user, vers->ts_rcs)) + (vers->ts_user && !STREQ (vers->ts_user, vers->ts_rcs))) { /* The removal should happen if either the file has never changed * on the destination or the file has changed to be identical to -- GitLab