tests/test-mq-git.t
branchstable
changeset 34089 e05e50fbdeaf
parent 23172 e955549cd045
child 34090 987a85c42b08
equal deleted inserted replaced
34027:3c3066367d72 34089:e05e50fbdeaf
   206   --- /dev/null
   206   --- /dev/null
   207   +++ b/c
   207   +++ b/c
   208   @@ -0,0 +1,1 @@
   208   @@ -0,0 +1,1 @@
   209   +a
   209   +a
   210 
   210 
   211   $ cd ..
   211 Test how [diff] configuration influence and cause invalid or lossy patches:
   212 
   212 
       
   213   $ cat <<EOF >> .hg/hgrc
       
   214   > [mq]
       
   215   > git = AUTO
       
   216   > [diff]
       
   217   > nobinary = True
       
   218   > noprefix = True
       
   219   > showfunc = True
       
   220   > ignorews = True
       
   221   > ignorewsamount = True
       
   222   > ignoreblanklines = True
       
   223   > unified = 1
       
   224   > EOF
       
   225 
       
   226   $ echo ' a' > a
       
   227   $ hg qnew prepare -d '0 0'
       
   228   $ echo '  a' > a
       
   229   $ printf '\0' > b
       
   230   $ echo >> c
       
   231   $ hg qnew diff -d '0 0'
       
   232 
       
   233   $ cat .hg/patches/prepare
       
   234   # HG changeset patch
       
   235   # Date 0 0
       
   236   # Parent  cf0bfe72686a47d8d7d7b4529a3adb8b0b449a9f
       
   237   
       
   238   $ cat .hg/patches/diff
       
   239   # HG changeset patch
       
   240   # Date 0 0
       
   241   # Parent  fb9c4422b0f37dd576522dd9a3f99b825c177efe
       
   242   
       
   243   diff --git b b
       
   244   Binary file b has changed
       
   245 
       
   246   $ cd ..
       
   247