[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2] |
Date: |
Wed, 30 Nov 2005 16:14:57 -0500 |
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.433.4.8 ccvs/src/client.c:1.433.4.9
--- ccvs/src/client.c:1.433.4.8 Wed Nov 30 19:58:46 2005
+++ ccvs/src/client.c Wed Nov 30 21:14:56 2005
@@ -2008,15 +2008,21 @@
ts[0] == '+' || last_merge_conflict ? file_timestamp : NULL);
if (last_merge_conflict)
{
- cvs_output ("C ", 2);
- cvs_output (short_pathname, 0);
- cvs_output ("\n", 1);
+ if (!really_quiet)
+ {
+ cvs_output ("C ", 2);
+ cvs_output (short_pathname, 0);
+ cvs_output ("\n", 1);
+ }
}
else if (last_merge)
{
- cvs_output ("M ", 2);
- cvs_output (short_pathname, 0);
- cvs_output ("\n", 1);
+ if (!really_quiet)
+ {
+ cvs_output ("M ", 2);
+ cvs_output (short_pathname, 0);
+ cvs_output ("\n", 1);
+ }
}
last_merge= false;
last_merge_conflict = false;
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/17
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/18
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/29
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2],
Derek Robert Price <=
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30