tests/test-diff-ignore-whitespace.t
branchstable
changeset 16089 2e8f4b82c551
parent 15509 3774e1453ef4
child 17742 405b6bd015df
equal deleted inserted replaced
16086:d1538789a1b3 16089:2e8f4b82c551
   453   @@ -1,2 +1,3 @@
   453   @@ -1,2 +1,3 @@
   454   -hello world
   454   -hello world
   455   +hello 
   455   +hello 
   456   +world
   456   +world
   457    goodbye world
   457    goodbye world
       
   458 
       
   459 Test hunk offsets adjustments with --ignore-blank-lines
       
   460 
       
   461   $ hg revert -aC
       
   462   reverting foo
       
   463   $ printf '\nb\nx\nd\n' > a
       
   464   $ printf 'b\ny\nd\n' > b
       
   465   $ hg add a b
       
   466   $ hg ci -m add
       
   467   $ hg cat -r . a > b
       
   468   $ hg cat -r . b > a
       
   469   $ hg diff -B --nodates a > ../diffa
       
   470   $ cat ../diffa
       
   471   diff -r 0e66aa54f318 a
       
   472   --- a/a
       
   473   +++ b/a
       
   474   @@ -1,4 +1,4 @@
       
   475    
       
   476    b
       
   477   -x
       
   478   +y
       
   479    d
       
   480   $ hg diff -B --nodates b > ../diffb
       
   481   $ cat ../diffb
       
   482   diff -r 0e66aa54f318 b
       
   483   --- a/b
       
   484   +++ b/b
       
   485   @@ -1,3 +1,3 @@
       
   486    b
       
   487   -y
       
   488   +x
       
   489    d
       
   490   $ hg revert -aC
       
   491   reverting a
       
   492   reverting b
       
   493   $ hg import --no-commit ../diffa
       
   494   applying ../diffa
       
   495   $ hg revert -aC
       
   496   reverting a
       
   497   $ hg import --no-commit ../diffb
       
   498   applying ../diffb
       
   499   $ hg revert -aC
       
   500   reverting b