Mercurial > hg
view tests/test-rawcommit1 @ 1015:22571b8d35d3
Add automatic binary file detection to diff and export
Based on a patch by Fuming Wang
- add util.binary which decides whether a file is binary if it has any NUL
characters in the first 1K.
- teach mdiff.unidiff to print "binary file <x> has changed" for binary files
- add text flag to cause unidiff and dodiff to treat all files as text
- add -a and --text flags (like diff(1)) to hg diff and export
- update docs
author | mpm@selenic.com |
---|---|
date | Tue, 23 Aug 2005 19:58:46 -0700 |
parents | 0902ffece4b4 |
children | 2073e5a71008 |
line wrap: on
line source
#!/bin/sh hg --debug init echo this is a1 > a hg add a hg commit -m0 -d "0 0" echo this is b1 > b hg add b hg commit -m1 -d "0 0" hg manifest 1 echo this is c1 > c hg rawcommit -p 1 -d "0 0" -m2 c hg manifest 2 hg parents rm b hg rawcommit -p 2 -d "0 0" -m3 b hg manifest 3 hg parents echo this is a22 > a hg rawcommit -p 3 -d "0 0" -m4 a hg manifest 4 hg parents echo this is c22 > c hg rawcommit -p 1 -d "0 0" -m5 c hg manifest 5 hg parents # merge, but no files changed hg rawcommit -p 4 -p 5 -d "0 0" -m6 hg manifest 6 hg parents # no changes what-so-ever hg rawcommit -p 6 -d "0 0" -m7 hg manifest 7 hg parents