[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 09bf62aebfb743946aa7b3fa7815a4ecda9dcf
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 09bf62aebfb743946aa7b3fa7815a4ecda9dcfc9 |
Date: |
Thu, 9 Jun 2005 21:12:26 UT |
-----------------------------------------------------------------
Revision: 09bf62aebfb743946aa7b3fa7815a4ecda9dcfc9
Ancestor: 7b85d52f5c777c7cdbd2f5b17f284d9b87f6936a
Author: address@hidden
Date: 2005-06-09T21:01:48
Branch: net.venge.monotone
Deleted files:
tests/t_merge_binary.at
Added files:
tests/t_merge_manual.at
Modified files:
ChangeLog diff_patch.cc diff_patch.hh file_io.cc file_io.hh
lua.cc monotone.texi std_hooks.lua testsuite.at work.cc
work.hh
ChangeLog:
2005-06-09 Riccardo Ghetta <address@hidden>
* diff_patch.cc/hh: honor the new manual_merge attribute
* file_io.cc/hh: move here the guess_binary function
* lua.cc: let guess_binary available to lua
* std_hooks.lua: handle manual_merge as an add-time attribute and
initialize by default make it true if the file appears to be binary.
Make read_contents_of_file able to read "binary" files.
* tests/t_merge_manual.at: tests new behaviour, superceding the
old XFAIL t_merge_binary.at test.
* monotone.texi: document changes, adding a small section on merging.
txtCnytnogFbj.txt
Description: Diff [7b85d52f5c777c7cdbd2f5b17f284d9b87f6936a] -> [09bf62aebfb743946aa7b3fa7815a4ecda9dcfc9]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 09bf62aebfb743946aa7b3fa7815a4ecda9dcfc9,
monotone <=