isync

commit be6e07c5c93fd8da1986e496ee6a19b342e8f460
parent d7e3ae4b74ef30e5a3ea255099a89b07697fb7cc
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date:   Tue, 28 Dec 2021 12:55:19 +0100

tone down complaints in merge_ops()

speak more accurately of redundancy, not conflict. these are fatal
errors at all only because the user likely meant something else than
they typed, so we force them to think again.

Diffstat:
M
src/config.c
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/config.c b/src/config.c
@@ -312,7 +312,7 @@ merge_ops( int cops, int ops[], const char *chan_name )
 		if (aops & OP_MASK_TYPE) {  // PullNew, etc.
 			if (aops & cops & OP_MASK_TYPE) {  // Overlapping New, etc.
 			  cfl:
-				error( "Conflicting Sync args specified %s.\n", channel_str( chan_name ) );
+				error( "Redundant Sync options specified %s.\n", channel_str( chan_name ) );
 				return 1;
 			}
 			// Mix in non-overlapping Push/Pull or New, etc.
@@ -344,7 +344,7 @@ merge_ops( int cops, int ops[], const char *chan_name )
 		op = boxOps[i].op;
 		if (ops[F] & (op * (XOP_HAVE_EXPUNGE / OP_EXPUNGE))) {
 			if (aops & cops & op) {
-				error( "Conflicting %s args specified %s.\n", boxOps[i].name, channel_str( chan_name ) );
+				error( "Redundant %s options specified %s.\n", boxOps[i].name, channel_str( chan_name ) );
 				return 1;
 			}
 			ops[F] |= cops & op;