The unified diff between revisions [3099ff90..] and [e9aa88ea..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'ChangeLog'

#
#
# patch "ChangeLog"
#  from [6c66bdb12e94b277dd3896b4fd4f2ae08ab167b3]
#    to [c3089fbae7f78f8c0b6419f40270c96678d4cc0b]
#
============================================================
--- ChangeLog	6c66bdb12e94b277dd3896b4fd4f2ae08ab167b3
+++ ChangeLog	c3089fbae7f78f8c0b6419f40270c96678d4cc0b
@@ -1,3 +1,27 @@
+2005-10-06  Matthew Gregan  <kinetik@orcon.net.nz>
+
+	* std_hooks.lua (merge3_emacs_cmd): Minor cleanup.
+	* std_hooks.lua: Pass '--eval' rather than '-eval' to Emacs; the
+	CVS emacsclient does not consider '-eval' as valid.
+	* platform.hh, unix/fs.cc, win32/fs.cc (rename_clobberingly): New
+	function for best-effort atomic renames.  This will probably never
+	be atomic on Win32.
+	* file_io.cc (write_data_impl): Append process ID to temporary
+	file name so that multiple monotone processes operating on the
+	same working copy are less likely to clobber each other.  Use
+	rename_clobberingly().
+	* ui.cc (user_interface): Allow std::cout to raise
+	ios_base::failure exceptions if stream goes bad (e.g. stream
+	receives EPIPE).
+	* monotone.cc (cpp_main): Catch ios_base::failure exceptions and
+	exit cleanly.
+	* main.cc (main_with_signal_handlers): Install handler to ignore
+	SIGPIPE.
+	* Makefile.am: Remove platform_netsync.cc references.
+	* {unix,win32}/platform_netsync.cc: Remove files.
+	* platform.hh, netsync.cc (run_netsync_protocol):
+	Remove {start,end}_platform_netsync() calls.
+
 2005-10-04  Nathaniel Smith  <njs@pobox.com>

 	* monotone.texi (Automation): Document the mysterious columns of
@@ -138,6 +162,14 @@ 2005-09-27  Richard Levitte  <richard@le
 	(Branching and Merging) ended up as a a separate chapter of it's
 	own...

+2005-09-27  Matt Johnston  <matt@ucc.asn.au>
+
+	* netsync.cc (ancestry_fetcher): new approach to requesting file
+	and manifest deltas and full data. Tries to be more efficient
+	for the vcache of recontstructed data, and conceptually simpler
+
+	* tests/t_netsync_unrelated.at: passes, remove XFAIL
+
 2005-09-26  BenoƮt Dejean  <benoit@placenet.org>

 	* database.cc: Merged 3 strings.
@@ -12223,3 +12255,4 @@ 2003-04-06  graydon hoare  <graydon@pobo
 2003-04-06  graydon hoare  <graydon@pobox.com>

 	* initial release.
+