#
# patch "ChangeLog"
# from [0e30ad697efa6ba467c0c68cb1c01359f86057fe]
# to [3fcaecec0f0da336198b08d1661dd2790f7e4097]
#
# patch "netsync.cc"
# from [0daec938d665df9d97f4978f670c2cf6fbda75d6]
# to [702c423b5f711e9841c9d11536e27ee46126f7e7]
#
========================================================================
--- ChangeLog 0e30ad697efa6ba467c0c68cb1c01359f86057fe
+++ ChangeLog 3fcaecec0f0da336198b08d1661dd2790f7e4097
@@ -9175,24 +9175,6 @@
* monotone.texi: Fix typos.
-2004-11-16 Christof Petig
-
- merge "monotone diff f225171baf37281d463a8547def213475dde2305
- 4609d78a317ad3ca9b8644f2900ca719962664d9" into changeset head
-
-2004-06-18 Christof Petig
-
- * netsync.cc: (struct PipeStream): New Stream that can handle two
- filedescriptors (one for reading, one for writing)
- (struct session): use PipeStream, pair of sockets
- (pipe_and_fork): new helper function for creating a pipe to/from
- a command (pipe,fork,dup,close)
- (find_wordend,parse_ssh_url): helper functions to parse an URL
- (call_server): recognize ssh: and file: URLs
- (serve_stdio): variant of serve_connections for stdio
- (run_netsync_protocol): call serve_stdio if address is -
-
-
2004-11-08 graydon hoare
* monotone.texi: Some minor cleanups.
========================================================================
--- netsync.cc 0daec938d665df9d97f4978f670c2cf6fbda75d6
+++ netsync.cc 702c423b5f711e9841c9d11536e27ee46126f7e7
@@ -1 +1,4011 @@
-netsync.cc
+// copyright (C) 2004 graydon hoare
+// all rights reserved.
+// licensed to the public under the terms of the GNU GPL (>= 2)
+// see the file COPYING for details
+
+#include