Show More
@@ -1756,6 +1756,8 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1756 | else: |
|
1756 | else: | |
1757 | header.append('deleted file mode %s\n' % |
|
1757 | header.append('deleted file mode %s\n' % | |
1758 | gitmode[man1.flags(f)]) |
|
1758 | gitmode[man1.flags(f)]) | |
|
1759 | if util.binary(to): | |||
|
1760 | dodiff = 'binary' | |||
1759 | elif not to or util.binary(to): |
|
1761 | elif not to or util.binary(to): | |
1760 | # regular diffs cannot represent empty file deletion |
|
1762 | # regular diffs cannot represent empty file deletion | |
1761 | losedatafn(f) |
|
1763 | losedatafn(f) |
@@ -200,7 +200,11 b' git=auto: regular diff for regular files' | |||||
200 | % git=auto: git diff for rmbinary |
|
200 | % git=auto: git diff for rmbinary | |
201 | diff --git a/rmbinary b/rmbinary |
|
201 | diff --git a/rmbinary b/rmbinary | |
202 | deleted file mode 100644 |
|
202 | deleted file mode 100644 | |
203 | Binary file rmbinary has changed |
|
203 | index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000 | |
|
204 | GIT binary patch | |||
|
205 | literal 0 | |||
|
206 | Hc$@<O00001 | |||
|
207 | ||||
204 |
|
208 | |||
205 | % git=auto: git diff for bintoregular |
|
209 | % git=auto: git diff for bintoregular | |
206 | diff --git a/bintoregular b/bintoregular |
|
210 | diff --git a/bintoregular b/bintoregular | |
@@ -210,6 +214,7 b' git=auto: regular diff for regular files' | |||||
210 | Uc$`bh%qz(+N=+}#Ni5<5043uE82|tP |
|
214 | Uc$`bh%qz(+N=+}#Ni5<5043uE82|tP | |
211 |
|
215 | |||
212 |
|
216 | |||
|
217 | ||||
213 | git=warn: regular diff with data loss warnings |
|
218 | git=warn: regular diff with data loss warnings | |
214 |
|
219 | |||
215 | $ hg autodiff --git=warn |
|
220 | $ hg autodiff --git=warn |
General Comments 0
You need to be logged in to leave comments.
Login now