cvs-cvs
[Top][All Lists]
Advanced

[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: Thu, 01 Dec 2005 15:24:12 -0500

Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.433.4.14 ccvs/src/client.c:1.433.4.15
--- ccvs/src/client.c:1.433.4.14        Thu Dec  1 18:45:16 2005
+++ ccvs/src/client.c   Thu Dec  1 20:23:45 2005
@@ -2430,13 +2430,16 @@
     read_line (&base_merge_rev1);
     read_line (&base_merge_rev2);
 
-    cvs_output ("Merging differences between ", 0);
-    cvs_output (base_merge_rev1, 0);
-    cvs_output (" and ", 5);
-    cvs_output (base_merge_rev2, 0);
-    cvs_output (" into `", 7);
-    cvs_output (short_pathname, 0);
-    cvs_output ("'\n", 2);
+    if (!really_quiet)
+    {
+       cvs_output ("Merging differences between ", 0);
+       cvs_output (base_merge_rev1, 0);
+       cvs_output (" and ", 5);
+       cvs_output (base_merge_rev2, 0);
+       cvs_output (" into `", 7);
+       cvs_output (short_pathname, 0);
+       cvs_output ("'\n", 2);
+    }
 
     f1 = make_base_file_name (filename, base_merge_rev1);
     f2 = make_base_file_name (filename, base_merge_rev2);
@@ -2523,6 +2526,18 @@
 
 
 static void
+handle_base_merged (char *args, size_t len)
+{
+    struct update_entries_data dat;
+    dat.contents = UPDATE_ENTRIES_BASE;
+    dat.existp = UPDATE_ENTRIES_EXISTING_OR_NEW;
+    dat.timestamp = "Result of merge";
+    call_in_directory (args, update_entries, &dat);
+}
+
+
+
+static void
 remove_entry (void *data, List *ent_list, const char *short_pathname,
               const char *filename)
 {
@@ -3613,6 +3628,8 @@
     RSP_LINE("Base-merge", handle_base_merge, response_type_normal,
             rs_optional),
     RSP_LINE("Base-entry", handle_base_entry, response_type_normal,
+            rs_optional),
+    RSP_LINE("Base-merged", handle_base_merged, response_type_normal,
             rs_optional),
 
     /* Possibly should be response_type_error.  */




reply via email to

[Prev in Thread] Current Thread [Next in Thread]