Mercurial > hg

view tests/test-diff-subdir.t @ 17021:955662c1d0e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-bookmarks-pushpull: partially adapt for Windows The kill call at the end is redundant, as we already have 199: $ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log 200: $ cat ../hg.pid >> $DAEMON_PIDS So there is nothing left that would not already be killed by the $DAEMON_PIDS mechanism.
author Adrian Buehlmann <adrian@cadifra.com>
date Wed, 20 Jun 2012 18:02:01 +0200
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 ..