tests/test-diffdir.t
author Adrian Buehlmann <adrian@cadifra.com>
Sun, 12 Sep 2010 11:52:13 +0200
changeset 12259 7b05cb9ac6d2
parent 12156 4c94b6d0fb1c
child 12316 4134686b83e1
permissions -rw-r--r--
tests: unify test-merge-prompt

  $ hg init
  $ touch a
  $ hg add a
  $ hg ci -m "a"

  $ echo 123 > b
  $ hg add b
  $ hg diff --nodates
  diff -r 3903775176ed b
  --- /dev/null
  +++ b/b
  @@ -0,0 +1,1 @@
  +123

  $ hg diff --nodates -r tip
  diff -r 3903775176ed b
  --- /dev/null
  +++ b/b
  @@ -0,0 +1,1 @@
  +123

  $ echo foo > a
  $ hg diff --nodates
  diff -r 3903775176ed a
  --- a/a
  +++ b/a
  @@ -0,0 +1,1 @@
  +foo
  diff -r 3903775176ed b
  --- /dev/null
  +++ b/b
  @@ -0,0 +1,1 @@
  +123

  $ hg diff -r ""
  abort: 00changelog.i@: ambiguous identifier!
  $ hg diff -r tip -r ""
  abort: 00changelog.i@: ambiguous identifier!

  $ true