tests/test-add.t
author Yuya Nishihara <yuya@tcha.org>
Fri, 16 Mar 2018 22:36:40 +0900
changeset 37067 04aafcec00b9
parent 36939 45bfcd16f27e
child 37756 e7bf5a73e4e1
permissions -rw-r--r--
templater: add context.preload(t) to test if the specified template exists I'm going to remove 'templ' from the resources dict because it is the only resource that the caller can't provide. This also implies that putting 'templ' into the resources dict creates a reference cycle. context.preload(t) will be used in place of templater.__contains__().
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
     1
  $ hg init a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
     2
  $ cd a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
     3
  $ echo a > a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
     4
  $ hg add -n
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
     5
  adding a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
     6
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
     7
  ? a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
     8
  $ hg add
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
     9
  adding a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    10
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    11
  A a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    12
  $ hg forget a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    13
  $ hg add
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    14
  adding a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    15
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    16
  A a
33501
7008f6819002 context: name files relative to cwd in warning messages
Matt Harbison <matt_harbison@yahoo.com>
parents: 32398
diff changeset
    17
  $ mkdir dir
7008f6819002 context: name files relative to cwd in warning messages
Matt Harbison <matt_harbison@yahoo.com>
parents: 32398
diff changeset
    18
  $ cd dir
7008f6819002 context: name files relative to cwd in warning messages
Matt Harbison <matt_harbison@yahoo.com>
parents: 32398
diff changeset
    19
  $ hg add ../a
7008f6819002 context: name files relative to cwd in warning messages
Matt Harbison <matt_harbison@yahoo.com>
parents: 32398
diff changeset
    20
  ../a already tracked!
7008f6819002 context: name files relative to cwd in warning messages
Matt Harbison <matt_harbison@yahoo.com>
parents: 32398
diff changeset
    21
  $ cd ..
5207
212de429e000 make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    22
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    23
  $ echo b > b
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    24
  $ hg add -n b
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    25
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    26
  A a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    27
  ? b
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
    28
  $ hg add b
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    29
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    30
  A a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    31
  A b
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    32
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    33
should fail
5207
212de429e000 make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    34
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    35
  $ hg add b
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    36
  b already tracked!
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    37
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    38
  A a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    39
  A b
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    40
16875
ee9bd7ef0a0e test-add: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 15524
diff changeset
    41
#if no-windows
13962
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    42
  $ echo foo > con.xml
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    43
  $ hg --config ui.portablefilenames=jump add con.xml
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    44
  abort: ui.portablefilenames value is invalid ('jump')
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    45
  [255]
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    46
  $ hg --config ui.portablefilenames=abort add con.xml
33798
2cd5aba5e1d2 scmutil: use util.shellquote instead of %r
Augie Fackler <augie@google.com>
parents: 33501
diff changeset
    47
  abort: filename contains 'con', which is reserved on Windows: con.xml
13962
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    48
  [255]
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    49
  $ hg st
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    50
  A a
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    51
  A b
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    52
  ? con.xml
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    53
  $ hg add con.xml
33798
2cd5aba5e1d2 scmutil: use util.shellquote instead of %r
Augie Fackler <augie@google.com>
parents: 33501
diff changeset
    54
  warning: filename contains 'con', which is reserved on Windows: con.xml
13962
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    55
  $ hg st
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    56
  A a
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    57
  A b
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    58
  A con.xml
16974
01ed5bb5cd41 tests: use hghave eol-in-paths to test for support for ':' in filenames and " "
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
    59
  $ hg forget con.xml
01ed5bb5cd41 tests: use hghave eol-in-paths to test for support for ':' in filenames and " "
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
    60
  $ rm con.xml
01ed5bb5cd41 tests: use hghave eol-in-paths to test for support for ':' in filenames and " "
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
    61
#endif
01ed5bb5cd41 tests: use hghave eol-in-paths to test for support for ':' in filenames and " "
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
    62
01ed5bb5cd41 tests: use hghave eol-in-paths to test for support for ':' in filenames and " "
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
    63
#if eol-in-paths
13962
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    64
  $ echo bla > 'hello:world'
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    65
  $ hg --config ui.portablefilenames=abort add
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    66
  adding hello:world
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    67
  abort: filename contains ':', which is reserved on Windows: 'hello:world'
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    68
  [255]
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    69
  $ hg st
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    70
  A a
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    71
  A b
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    72
  ? hello:world
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    73
  $ hg --config ui.portablefilenames=ignore add
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    74
  adding hello:world
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    75
  $ hg st
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    76
  A a
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    77
  A b
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    78
  A hello:world
16875
ee9bd7ef0a0e test-add: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 15524
diff changeset
    79
#endif
13962
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents: 12399
diff changeset
    80
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    81
  $ hg ci -m 0 --traceback
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    82
25689
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
    83
  $ hg log -r "heads(. or wdir() & file('**'))"
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
    84
  changeset:   0:* (glob)
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
    85
  tag:         tip
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
    86
  user:        test
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
    87
  date:        Thu Jan 01 00:00:00 1970 +0000
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
    88
  summary:     0
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
    89
  
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    90
should fail
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    91
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    92
  $ hg add a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    93
  a already tracked!
5207
212de429e000 make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    94
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    95
  $ echo aa > a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    96
  $ hg ci -m 1
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    97
  $ hg up 0
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    98
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
    99
  $ echo aaa > a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   100
  $ hg ci -m 2
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   101
  created new head
5207
212de429e000 make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
   102
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   103
  $ hg merge
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   104
  merging a
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26000
diff changeset
   105
  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   106
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
35704
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
   107
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
   108
  [1]
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   109
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   110
  M a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   111
  ? a.orig
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   112
25689
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
   113
wdir doesn't cause a crash, and can be dynamically selected if dirty
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
   114
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
   115
  $ hg log -r "heads(. or wdir() & file('**'))"
25762
f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 25689
diff changeset
   116
  changeset:   2147483647:ffffffffffff
25689
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
   117
  parent:      2:* (glob)
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
   118
  parent:      1:* (glob)
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
   119
  user:        test
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
   120
  date:        * (glob)
1cce81121472 revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents: 24807
diff changeset
   121
  
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   122
should fail
5207
212de429e000 make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
   123
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   124
  $ hg add a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   125
  a already tracked!
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   126
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   127
  M a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   128
  ? a.orig
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   129
  $ hg resolve -m a
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21267
diff changeset
   130
  (no more unresolved files)
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   131
  $ hg ci -m merge
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   132
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12365
diff changeset
   133
Issue683: peculiarity with hg revert of an removed then added file
5688
883d887c6408 commands: add exits(1) if a specified file cannot be added (issue 891)
Patrick Mezard <pmezard@gmail.com>
parents: 5207
diff changeset
   134
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   135
  $ hg forget a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   136
  $ hg add a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   137
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   138
  ? a.orig
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   139
  $ hg rm a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   140
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   141
  R a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   142
  ? a.orig
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   143
  $ echo a > a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   144
  $ hg add a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   145
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   146
  M a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   147
  ? a.orig
5688
883d887c6408 commands: add exits(1) if a specified file cannot be added (issue 891)
Patrick Mezard <pmezard@gmail.com>
parents: 5207
diff changeset
   148
36200
deb851914fd7 dirstate: drop explicit files that shouldn't match (BC) (issue4679)
Yuya Nishihara <yuya@tcha.org>
parents: 35704
diff changeset
   149
excluded file shouldn't be added even if it is explicitly specified
deb851914fd7 dirstate: drop explicit files that shouldn't match (BC) (issue4679)
Yuya Nishihara <yuya@tcha.org>
parents: 35704
diff changeset
   150
deb851914fd7 dirstate: drop explicit files that shouldn't match (BC) (issue4679)
Yuya Nishihara <yuya@tcha.org>
parents: 35704
diff changeset
   151
  $ hg add a.orig -X '*.orig'
deb851914fd7 dirstate: drop explicit files that shouldn't match (BC) (issue4679)
Yuya Nishihara <yuya@tcha.org>
parents: 35704
diff changeset
   152
  $ hg st
deb851914fd7 dirstate: drop explicit files that shouldn't match (BC) (issue4679)
Yuya Nishihara <yuya@tcha.org>
parents: 35704
diff changeset
   153
  M a
deb851914fd7 dirstate: drop explicit files that shouldn't match (BC) (issue4679)
Yuya Nishihara <yuya@tcha.org>
parents: 35704
diff changeset
   154
  ? a.orig
deb851914fd7 dirstate: drop explicit files that shouldn't match (BC) (issue4679)
Yuya Nishihara <yuya@tcha.org>
parents: 35704
diff changeset
   155
23258
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   156
Forgotten file can be added back (as either clean or modified)
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   157
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   158
  $ hg forget b
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   159
  $ hg add b
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   160
  $ hg st -A b
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   161
  C b
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   162
  $ hg forget b
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   163
  $ echo modified > b
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   164
  $ hg add b
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   165
  $ hg st -A b
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   166
  M b
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   167
  $ hg revert -qC b
10697f29af2b add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 21947
diff changeset
   168
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   169
  $ hg add c && echo "unexpected addition of missing file"
15521
117f9190c1ba tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents: 15444
diff changeset
   170
  c: * (glob)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
   171
  [1]
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   172
  $ echo c > c
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   173
  $ hg add d c && echo "unexpected addition of missing file"
15521
117f9190c1ba tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents: 15444
diff changeset
   174
  d: * (glob)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
   175
  [1]
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   176
  $ hg st
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   177
  M a
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   178
  A c
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   179
  ? a.orig
19987
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   180
  $ hg up -C
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   181
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   182
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   183
forget and get should have the right order: added but missing dir should be
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   184
forgotten before file with same name is added
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   185
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   186
  $ echo file d > d
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   187
  $ hg add d
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   188
  $ hg ci -md
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   189
  $ hg rm d
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   190
  $ mkdir d
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   191
  $ echo a > d/a
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   192
  $ hg add d/a
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   193
  $ rm -r d
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   194
  $ hg up -C
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   195
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   196
  $ cat d
ba6486076429 merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents: 16974
diff changeset
   197
  file d
11795
06793ad30575 tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9166
diff changeset
   198
24537
2bb13f2b778c dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23258
diff changeset
   199
Test that adding a directory doesn't require case matching (issue4578)
2bb13f2b778c dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23258
diff changeset
   200
#if icasefs
2bb13f2b778c dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23258
diff changeset
   201
  $ mkdir -p CapsDir1/CapsDir
2bb13f2b778c dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23258
diff changeset
   202
  $ echo abc > CapsDir1/CapsDir/AbC.txt
2bb13f2b778c dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23258
diff changeset
   203
  $ mkdir CapsDir1/CapsDir/SubDir
2bb13f2b778c dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23258
diff changeset
   204
  $ echo def > CapsDir1/CapsDir/SubDir/Def.txt
2bb13f2b778c dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23258
diff changeset
   205
24790
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   206
  $ hg add capsdir1/capsdir
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33798
diff changeset
   207
  adding CapsDir1/CapsDir/AbC.txt
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33798
diff changeset
   208
  adding CapsDir1/CapsDir/SubDir/Def.txt
24548
c780a63f61ca forget: cleanup the output for an inexact case match on icasefs
Matt Harbison <matt_harbison@yahoo.com>
parents: 24537
diff changeset
   209
c780a63f61ca forget: cleanup the output for an inexact case match on icasefs
Matt Harbison <matt_harbison@yahoo.com>
parents: 24537
diff changeset
   210
  $ hg forget capsdir1/capsdir/abc.txt
24790
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   211
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   212
  $ hg forget capsdir1/capsdir
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33798
diff changeset
   213
  removing CapsDir1/CapsDir/SubDir/Def.txt
24790
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   214
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   215
  $ hg add capsdir1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33798
diff changeset
   216
  adding CapsDir1/CapsDir/AbC.txt
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33798
diff changeset
   217
  adding CapsDir1/CapsDir/SubDir/Def.txt
24790
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   218
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   219
  $ hg ci -m "AbCDef" capsdir1/capsdir
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   220
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   221
  $ hg status -A capsdir1/capsdir
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   222
  C CapsDir1/CapsDir/AbC.txt
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   223
  C CapsDir1/CapsDir/SubDir/Def.txt
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   224
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   225
  $ hg files capsdir1/capsdir
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33798
diff changeset
   226
  CapsDir1/CapsDir/AbC.txt
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33798
diff changeset
   227
  CapsDir1/CapsDir/SubDir/Def.txt
24790
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   228
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   229
  $ echo xyz > CapsDir1/CapsDir/SubDir/Def.txt
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   230
  $ hg ci -m xyz capsdir1/capsdir/subdir/def.txt
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   231
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   232
  $ hg revert -r '.^' capsdir1/capsdir
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33798
diff changeset
   233
  reverting CapsDir1/CapsDir/SubDir/Def.txt
24790
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   234
24807
fff8b779e63a test-add.t: fix output difference between Windows and OS X (issue4603)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24790
diff changeset
   235
The conditional tests above mean the hash on the diff line differs on Windows
fff8b779e63a test-add.t: fix output difference between Windows and OS X (issue4603)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24790
diff changeset
   236
and OS X
24790
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   237
  $ hg diff capsdir1/capsdir
24807
fff8b779e63a test-add.t: fix output difference between Windows and OS X (issue4603)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24790
diff changeset
   238
  diff -r * CapsDir1/CapsDir/SubDir/Def.txt (glob)
24790
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   239
  --- a/CapsDir1/CapsDir/SubDir/Def.txt	Thu Jan 01 00:00:00 1970 +0000
28034
e7ff258f71df tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26614
diff changeset
   240
  +++ b/CapsDir1/CapsDir/SubDir/Def.txt	* (glob)
24790
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   241
  @@ -1,1 +1,1 @@
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   242
  -xyz
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   243
  +def
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   244
26000
9ac4e81b9659 match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
Matt Harbison <matt_harbison@yahoo.com>
parents: 25762
diff changeset
   245
  $ hg mv CapsDir1/CapsDir/abc.txt CapsDir1/CapsDir/ABC.txt
9ac4e81b9659 match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
Matt Harbison <matt_harbison@yahoo.com>
parents: 25762
diff changeset
   246
  $ hg ci -m "case changing rename" CapsDir1/CapsDir/AbC.txt CapsDir1/CapsDir/ABC.txt
9ac4e81b9659 match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
Matt Harbison <matt_harbison@yahoo.com>
parents: 25762
diff changeset
   247
9ac4e81b9659 match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
Matt Harbison <matt_harbison@yahoo.com>
parents: 25762
diff changeset
   248
  $ hg status -A capsdir1/capsdir
9ac4e81b9659 match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
Matt Harbison <matt_harbison@yahoo.com>
parents: 25762
diff changeset
   249
  M CapsDir1/CapsDir/SubDir/Def.txt
9ac4e81b9659 match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
Matt Harbison <matt_harbison@yahoo.com>
parents: 25762
diff changeset
   250
  C CapsDir1/CapsDir/ABC.txt
9ac4e81b9659 match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
Matt Harbison <matt_harbison@yahoo.com>
parents: 25762
diff changeset
   251
24790
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   252
  $ hg remove -f 'glob:**.txt' -X capsdir1/capsdir
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24548
diff changeset
   253
  $ hg remove -f 'glob:**.txt' -I capsdir1/capsdir
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33798
diff changeset
   254
  removing CapsDir1/CapsDir/ABC.txt
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33798
diff changeset
   255
  removing CapsDir1/CapsDir/SubDir/Def.txt
24537
2bb13f2b778c dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23258
diff changeset
   256
#endif
2bb13f2b778c dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23258
diff changeset
   257
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16875
diff changeset
   258
  $ cd ..
36939
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   259
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   260
test --dry-run mode in forget
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   261
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   262
  $ hg init testdir_forget
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   263
  $ cd testdir_forget
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   264
  $ echo foo > foo
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   265
  $ hg add foo
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   266
  $ hg commit -m "foo"
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   267
  $ hg forget foo --dry-run -v
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   268
  removing foo
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   269
  $ hg diff
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   270
  $ hg forget not_exist -n
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   271
  not_exist: $ENOENT$
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   272
  [1]
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   273
45bfcd16f27e forget: add --dry-run mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 36200
diff changeset
   274
  $ cd ..