tests/test-diff-subdir.t
author Adrian Buehlmann <adrian@cadifra.com>
Tue, 19 Apr 2011 12:42:53 +0200
changeset 13962 8b252e826c68
parent 12140 552ea44c1842
child 16913 f2719b387380
permissions -rw-r--r--
add: introduce a warning message for non-portable filenames (issue2756) (BC) On POSIX platforms, the 'add', 'addremove', 'copy' and 'rename' commands now warn if a file has a name that can't be checked out on Windows. Example: $ hg add con.xml warning: filename contains 'con', which is reserved on Windows: 'con.xml' $ hg status A con.xml The file is added despite the warning. The warning is ON by default. It can be suppressed by setting the config option 'portablefilenames' in section 'ui' to 'ignore' or 'false': $ hg --config ui.portablefilenames=ignore add con.xml $ hg sta A con.xml If ui.portablefilenames is set to 'abort', then the command is aborted: $ hg --config ui.portablefilenames=abort add con.xml abort: filename contains 'con', which is reserved on Windows: 'con.xml' On Windows, the ui.portablefilenames config setting is irrelevant and the command is always aborted if a problematic filename is found.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12140
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
     1
  $ hg init
2879
66eff8355168 tests: new test for hg diff of a subdirectory only
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     2
12140
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
     3
  $ mkdir alpha
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
     4
  $ touch alpha/one
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
     5
  $ mkdir beta
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
     6
  $ touch beta/two
2879
66eff8355168 tests: new test for hg diff of a subdirectory only
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     7
12140
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
     8
  $ hg add alpha/one beta/two
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
     9
  $ hg ci -m "start"
2879
66eff8355168 tests: new test for hg diff of a subdirectory only
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    10
12140
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    11
  $ echo 1 > alpha/one
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    12
  $ echo 2 > beta/two
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    13
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    14
everything
2879
66eff8355168 tests: new test for hg diff of a subdirectory only
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    15
12140
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    16
  $ hg diff --nodates
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    17
  diff -r 7d5ef1aea329 alpha/one
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    18
  --- a/alpha/one
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    19
  +++ b/alpha/one
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    20
  @@ -0,0 +1,1 @@
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    21
  +1
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    22
  diff -r 7d5ef1aea329 beta/two
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    23
  --- a/beta/two
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    24
  +++ b/beta/two
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    25
  @@ -0,0 +1,1 @@
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    26
  +2
2879
66eff8355168 tests: new test for hg diff of a subdirectory only
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    27
12140
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    28
beta only
2879
66eff8355168 tests: new test for hg diff of a subdirectory only
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    29
12140
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    30
  $ hg diff --nodates beta
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    31
  diff -r 7d5ef1aea329 beta/two
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    32
  --- a/beta/two
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    33
  +++ b/beta/two
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    34
  @@ -0,0 +1,1 @@
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    35
  +2
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    36
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    37
inside beta
2879
66eff8355168 tests: new test for hg diff of a subdirectory only
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    38
12140
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    39
  $ cd beta
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    40
  $ hg diff --nodates .
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    41
  diff -r 7d5ef1aea329 beta/two
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    42
  --- a/beta/two
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    43
  +++ b/beta/two
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    44
  @@ -0,0 +1,1 @@
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    45
  +2
552ea44c1842 tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com>
parents: 3199
diff changeset
    46