Mercurial > hg

view tests/test-diff-subdir.t @ 21739:11e5ad038a7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: skipped test should not produce 'i' mark while retesting When '--retest' option is enabled then skipped test should not produce 'i' mark. This fixes a regression introduced by 92a6b16c9186 and about 200 previous changesets from Gregory Szorc.
author anuraggoel <anurag.dsps@gmail.com>
date Thu, 12 Jun 2014 02:36:52 +0530
parents f2719b387380
children e22248f6d257
line wrap: on
line source

  $ hg init

  $ mkdir alpha
  $ touch alpha/one
  $ mkdir beta
  $ touch beta/two

  $ hg add alpha/one beta/two
  $ hg ci -m "start"

  $ echo 1 > alpha/one
  $ echo 2 > beta/two

everything

  $ hg diff --nodates
  diff -r 7d5ef1aea329 alpha/one
  --- a/alpha/one
  +++ b/alpha/one
  @@ -0,0 +1,1 @@
  +1
  diff -r 7d5ef1aea329 beta/two
  --- a/beta/two
  +++ b/beta/two
  @@ -0,0 +1,1 @@
  +2

beta only

  $ hg diff --nodates beta
  diff -r 7d5ef1aea329 beta/two
  --- a/beta/two
  +++ b/beta/two
  @@ -0,0 +1,1 @@
  +2

inside beta

  $ cd beta
  $ hg diff --nodates .
  diff -r 7d5ef1aea329 beta/two
  --- a/beta/two
  +++ b/beta/two
  @@ -0,0 +1,1 @@
  +2

  $ cd ..