[Monotone-commits-diffs] net.venge.monotone, net.venge.monotone.issue-148-80: 5fc5ee39e5df44a9c65bfded2dca132082d96794

[code]

revision:            5fc5ee39e5df44a9c65bfded2dca132082d96794
date:                2012-08-05T17:28:47
author:              address@hidden
branch:              net.venge.monotone
branch:              net.venge.monotone.issue-148-80
changelog:
* test/func/diff_vs_manual_merge: new (should have been added in last commit)

manifest:
format_version "1"

new_manifest [871ec546b1a9e854a72c9c83e720cdeb1c3b11e2]

old_revision [09c2276fbcffdaca4bbb83d0f1fcefa76da15d12]

add_dir "test/func/diff_vs_manual_merge"

add_file "test/func/diff_vs_manual_merge/__driver__.lua"
 content [9264cfa19cf1c5998549c4ec902535ea1bad6ebf]

patch "doc/monotone.texi"
 from [0f1e2230272b68614efad33648dbf436e0d6f729]
   to [31b5e777afe82c7a55b7134e15e356f29773e976]
============================================================
--- doc/monotone.texi	0f1e2230272b68614efad33648dbf436e0d6f729
+++ doc/monotone.texi	31b5e777afe82c7a55b7134e15e356f29773e976
@@ -3493,6 +3493,7 @@ @subheading Dropped/Modified file Confli
 @command{conflicts} does not support resolving this conflict.
 
 @subheading Dropped/Modified file Conflict
address@hidden
 This conflict occurs when a file is dropped in one merge parent,
 and modified in the other.
 
@@ -5297,6 +5298,23 @@ @section Workspace
 
    @end table
 
+Several attributes are reserved for mtn use; they all start with ``mtn:'':
+    @table @command
+    @item mtn:encoding
+    Specify character encoding for the file.
+
+    @item mtn:execute
+    File is executable.
+
+    @item mtn:manual_merge
+    Don't use internal or external diff or merger.
+
+    @item mtn:resolve_conflict
+    Specify @command{drop} resolution for a recurring dropped/modified
+    conflict (@ref{dropped_modified_conflict}).
+
+    @end table
+
 @anchor{mtn address@hidden mtn commit
 @itemx mtn commit address@hidden address@hidden address@hidden
 @itemx mtn commit address@hidden address@hidden
============================================================
--- /dev/null	
+++ test/func/diff_vs_manual_merge/__driver__.lua	9264cfa19cf1c5998549c4ec902535ea1bad6ebf
@@ -0,0 +1,23 @@
+-- diff should not compute diffs for files with mtn:manual_merge attributes
+-- 
+-- In 1.0 and earlier, it only ignored files that file_io.cc
+-- guess_binary considered to be binary.
+--
+-- Consider a newly added 50 MB text file (Earth gravity
+-- coefficients); this simply hangs the diff engine (it may return
+-- eventually), so the user marks it with mtn:manual_merge.
+
+mtn_setup()
+
+addfile("small_file.text", "small file\n")
+commit("base", "testbranch")
+base = base_revision()
+
+addfile("grav.coef", "50 MB of coefficients\n")
+check(mtn("attr", "set", "grav.coef", "mtn:manual_merge", "true"), 0, nil, false)
+commit("abe_1", "testbranch")
+rev_1 = base_revision()
+
+check(mtn("diff", "-r", base, "-r", rev_1), 0, true, nil)
+check(not qgrep("^\\+\\+\\+ grav.coef", "stdout"))
+check(qgrep("^# grav.coef is binary", "stdout"))