[Monotone-devel] Updated Issue 210 - mtn diff should ignore mtn:manual_merge files (monotone)

[code]

Hello,

The following issue has been updated:

210 - mtn diff should ignore mtn:manual_merge files
Project: monotone
Status: Fixed
Reported by: Stephen Leake
URL: https://code.monotone.ca/p/monotone/issues/210/
Labels:
 Type:Incorrect Behavior
 Priority:Medium

Comments (last first):

# By Stephen Leake, Aug  4, 2012:

fixed in 09c2276fbcffdaca4bbb83d0f1fcefa76da15d12

 Status: Fixed

# By Stephen Leake, Jul 28, 2012:

Currently, diff only ignores files that are considered binary by file_io.cc 
guess_binary. But the user might have other reasons to exclude a file (such as 
it's too large, or it has a format that some other tool handles much better). 
Rather than having to specify --exclude every time, setting the 
mtn:manual_merge attribute should have that effect, just as that attribute 
excludes the file from internal merging.

# By Stephen Leake, Jul 28, 2012:

Steps to reproduce the problem:
-------------------------------

1. add a large (50 MB) text file 
2. run mtn diff; notice that it chokes 
3. add mtn:manual_merge to large file
4. run mtn diff

Expected result:
----------------
does not diff the manual_merge file, outputting a message about "has 
mtn:manual_merge attribute" instead.

Actual results:
---------------
still chokes (hangs, produces no output for a _very_ long time).


Output of `mtn version --full`:
-------------------------------
1.0



--
Issue: https://code.monotone.ca/p/monotone/issues/210/