tests/test-diff-binary-file.t
changeset 31822 fde4822b0102
parent 31821 66a9faadbc83
child 32940 75be14993fda
equal deleted inserted replaced
31821:66a9faadbc83 31822:fde4822b0102
   106   @@ -1,1 +1,1 @@
   106   @@ -1,1 +1,1 @@
   107   -\x00\x01\x02\x03 (esc)
   107   -\x00\x01\x02\x03 (esc)
   108   \ No newline at end of file
   108   \ No newline at end of file
   109   +\x00\x01\x02\x03 (esc)
   109   +\x00\x01\x02\x03 (esc)
   110 
   110 
       
   111 Test binary mode with extended git-style diff format
       
   112   $ hg diff --no-binary -r 0 -r 1
       
   113   diff -r fb45f71337ad -r 9ca112d1a3c1 binfile.bin
       
   114   Binary file binfile.bin has changed
       
   115 
       
   116   $ hg diff --git --no-binary -r 0 -r 1
       
   117   diff --git a/binfile.bin b/binfile.bin
       
   118   Binary file binfile.bin has changed
       
   119 
       
   120   $ hg diff --git --binary -r 0 -r 1
       
   121   diff --git a/binfile.bin b/binfile.bin
       
   122   index eaf36c1daccfdf325514461cd1a2ffbc139b5464..ba71a782e93f3fb63a428383706065e3ec2828e9
       
   123   GIT binary patch
       
   124   literal 5
       
   125   Mc${NkWMbw50018V5dZ)H
       
   126   
       
   127   $ hg diff --git --binary --config diff.nobinary=True -r 0 -r 1
       
   128   diff --git a/binfile.bin b/binfile.bin
       
   129   index eaf36c1daccfdf325514461cd1a2ffbc139b5464..ba71a782e93f3fb63a428383706065e3ec2828e9
       
   130   GIT binary patch
       
   131   literal 5
       
   132   Mc${NkWMbw50018V5dZ)H
       
   133   
       
   134 
       
   135   $ hg diff --git --binary --text -r 0 -r 1
       
   136   diff --git a/binfile.bin b/binfile.bin
       
   137   --- a/binfile.bin
       
   138   +++ b/binfile.bin
       
   139   @@ -1,1 +1,1 @@
       
   140   -\x00\x01\x02\x03 (esc)
       
   141   \ No newline at end of file
       
   142   +\x00\x01\x02\x03 (esc)
       
   143 
   111   $ cd ..
   144   $ cd ..