view tests/test-diffdir.t @ 12345:e0ee3e822a9a

Merge with stable
author Patrick Mezard <pmezard@gmail.com>
date Mon, 20 Sep 2010 22:29:13 +0200
parents 4134686b83e1
children 3b165c127690
line wrap: on
line source

  $ 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!
  [255]
  $ hg diff -r tip -r ""
  abort: 00changelog.i@: ambiguous identifier!
  [255]

  $ true