tests/test-diffdir.t
changeset 12156 4c94b6d0fb1c
parent 11921 650d8a023249
child 12316 4134686b83e1
equal deleted inserted replaced
12155:94ad12aa0530 12156:4c94b6d0fb1c
     1   $ hg init
     1   $ hg init
     2   $ touch a
     2   $ touch a
     3   $ hg add a
     3   $ hg add a
     4   $ hg ci -m "a" -d "1000000 0"
     4   $ hg ci -m "a"
     5 
     5 
     6   $ echo 123 > b
     6   $ echo 123 > b
     7   $ hg add b
     7   $ hg add b
     8   $ hg diff --nodates
     8   $ hg diff --nodates
     9   diff -r acd8075edac9 b
     9   diff -r 3903775176ed b
    10   --- /dev/null
    10   --- /dev/null
    11   +++ b/b
    11   +++ b/b
    12   @@ -0,0 +1,1 @@
    12   @@ -0,0 +1,1 @@
    13   +123
    13   +123
    14 
    14 
    15   $ hg diff --nodates -r tip
    15   $ hg diff --nodates -r tip
    16   diff -r acd8075edac9 b
    16   diff -r 3903775176ed b
    17   --- /dev/null
    17   --- /dev/null
    18   +++ b/b
    18   +++ b/b
    19   @@ -0,0 +1,1 @@
    19   @@ -0,0 +1,1 @@
    20   +123
    20   +123
    21 
    21 
    22   $ echo foo > a
    22   $ echo foo > a
    23   $ hg diff --nodates
    23   $ hg diff --nodates
    24   diff -r acd8075edac9 a
    24   diff -r 3903775176ed a
    25   --- a/a
    25   --- a/a
    26   +++ b/a
    26   +++ b/a
    27   @@ -0,0 +1,1 @@
    27   @@ -0,0 +1,1 @@
    28   +foo
    28   +foo
    29   diff -r acd8075edac9 b
    29   diff -r 3903775176ed b
    30   --- /dev/null
    30   --- /dev/null
    31   +++ b/b
    31   +++ b/b
    32   @@ -0,0 +1,1 @@
    32   @@ -0,0 +1,1 @@
    33   +123
    33   +123
    34 
    34