Mercurial > hg
annotate tests/test-add.t @ 26362:3bfc473f4d33
gitweb, monoblue: fix vertical align of spans in .sourcelines
Empty lines in file view could produce an inexplicable margin before the next
line (most noticeable in browsers on webkit/blink engine). That was making
empty lines seem taller than the rest.
Instead of using default vertical align, let's set it to 'top'.
This issue is actually present in paper, and only recently got into gitweb
(2239626369f5) and monoblue (119202d4d7a4). There's a bit more to it in paper,
so that will be dealt with in a future patch.
Recipe to see live: preferably using a webkit/blink browser, such as chromium,
browse a file with empty lines, e.g. https://selenic.com/hg/file/3.5/README#l8
Selecting a block of text that includes empty lines will reveal white "breaks"
in the selection. Highlighted line (#l8) also shows such a break below itself.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 25 Sep 2015 03:02:38 +0800 |
parents | 9ac4e81b9659 |
children | ef1eb6df7071 |
rev | line source |
---|---|
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 |
5207
212de429e000
make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
17 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
18 $ echo b > b |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
19 $ hg add -n b |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
20 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
21 A a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
22 ? b |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
23 $ hg add b |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
24 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
25 A a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
26 A b |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
27 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
28 should fail |
5207
212de429e000
make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
29 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
30 $ hg add b |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
31 b already tracked! |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
32 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
33 A a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
34 A b |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
35 |
16875
ee9bd7ef0a0e
test-add: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
15524
diff
changeset
|
36 #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
|
37 $ 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
|
38 $ 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
|
39 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
|
40 [255] |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
41 $ hg --config ui.portablefilenames=abort add con.xml |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
42 abort: filename contains 'con', which is reserved on Windows: 'con.xml' |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
43 [255] |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
44 $ hg st |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
45 A a |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
46 A b |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
47 ? con.xml |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
48 $ hg add con.xml |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
49 warning: filename contains 'con', which is reserved on Windows: 'con.xml' |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
50 $ hg st |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
51 A a |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
52 A b |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
53 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
|
54 $ 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
|
55 $ 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
|
56 #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
|
57 |
01ed5bb5cd41
tests: use hghave eol-in-paths to test for support for ':' in filenames and " "
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
58 #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
|
59 $ 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
|
60 $ 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
|
61 adding hello:world |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
62 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
|
63 [255] |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
64 $ hg st |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
65 A a |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
66 A b |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
67 ? hello:world |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
68 $ 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
|
69 adding hello:world |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
70 $ hg st |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
71 A a |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
72 A b |
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
73 A hello:world |
16875
ee9bd7ef0a0e
test-add: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
15524
diff
changeset
|
74 #endif |
13962
8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
75 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
76 $ hg ci -m 0 --traceback |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
77 |
25689
1cce81121472
revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents:
24807
diff
changeset
|
78 $ 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
|
79 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
|
80 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
|
81 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
|
82 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
|
83 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
|
84 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
85 should fail |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
86 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
87 $ hg add a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
88 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
|
89 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
90 $ echo aa > a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
91 $ hg ci -m 1 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
92 $ hg up 0 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
93 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
|
94 $ echo aaa > a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
95 $ hg ci -m 2 |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
96 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
|
97 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
98 $ hg merge |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
99 merging a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
100 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15444
diff
changeset
|
101 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
102 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
12314
f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents:
11795
diff
changeset
|
103 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
104 [1] |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
105 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
106 M a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
107 ? a.orig |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
108 |
25689
1cce81121472
revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents:
24807
diff
changeset
|
109 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
|
110 |
1cce81121472
revset: fix a crash in parents() when 'wdir()' is in the set
Matt Harbison <matt_harbison@yahoo.com>
parents:
24807
diff
changeset
|
111 $ 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
|
112 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
|
113 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
|
114 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
|
115 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
|
116 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
|
117 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
118 should fail |
5207
212de429e000
make hg add of a removed file unremove the file
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
119 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
120 $ hg add a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
121 a already tracked! |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
122 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
123 M a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
124 ? a.orig |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
125 $ 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
|
126 (no more unresolved files) |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
127 $ hg ci -m merge |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
128 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12365
diff
changeset
|
129 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
|
130 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
131 $ hg forget a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
132 $ hg add a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
133 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
134 ? a.orig |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
135 $ hg rm a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
136 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
137 R a |
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 $ echo a > a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
140 $ hg add a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
141 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
142 M a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
143 ? 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
|
144 |
23258
10697f29af2b
add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
21947
diff
changeset
|
145 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
|
146 |
10697f29af2b
add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
21947
diff
changeset
|
147 $ 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
|
148 $ 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
|
149 $ 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
|
150 C b |
10697f29af2b
add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
21947
diff
changeset
|
151 $ 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
|
152 $ 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
|
153 $ 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
|
154 $ 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
|
155 M b |
10697f29af2b
add: add back forgotten files even when not matching exactly (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
21947
diff
changeset
|
156 $ 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
|
157 |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
158 $ 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
|
159 c: * (glob) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
160 [1] |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
161 $ echo c > c |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
162 $ 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
|
163 d: * (glob) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
164 [1] |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
165 $ hg st |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
166 M a |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
167 A c |
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
168 ? a.orig |
19987
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
169 $ hg up -C |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
170 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
|
171 |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
172 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
|
173 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
|
174 |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
175 $ echo file d > d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
176 $ hg add d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
177 $ hg ci -md |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
178 $ hg rm d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
179 $ mkdir d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
180 $ echo a > d/a |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
181 $ hg add d/a |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
182 $ rm -r d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
183 $ hg up -C |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
184 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
|
185 $ cat d |
ba6486076429
merge: move forgets to the beginning of the action list
Siddharth Agarwal <sid0@fb.com>
parents:
16974
diff
changeset
|
186 file d |
11795
06793ad30575
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9166
diff
changeset
|
187 |
24537
2bb13f2b778c
dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23258
diff
changeset
|
188 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
|
189 #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
|
190 $ 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
|
191 $ 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
|
192 $ 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
|
193 $ 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
|
194 |
24790
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
195 $ hg add capsdir1/capsdir |
24537
2bb13f2b778c
dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23258
diff
changeset
|
196 adding CapsDir1/CapsDir/AbC.txt (glob) |
2bb13f2b778c
dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23258
diff
changeset
|
197 adding CapsDir1/CapsDir/SubDir/Def.txt (glob) |
24548
c780a63f61ca
forget: cleanup the output for an inexact case match on icasefs
Matt Harbison <matt_harbison@yahoo.com>
parents:
24537
diff
changeset
|
198 |
c780a63f61ca
forget: cleanup the output for an inexact case match on icasefs
Matt Harbison <matt_harbison@yahoo.com>
parents:
24537
diff
changeset
|
199 $ hg forget capsdir1/capsdir/abc.txt |
c780a63f61ca
forget: cleanup the output for an inexact case match on icasefs
Matt Harbison <matt_harbison@yahoo.com>
parents:
24537
diff
changeset
|
200 removing CapsDir1/CapsDir/AbC.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
|
201 |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
202 $ hg forget capsdir1/capsdir |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
203 removing CapsDir1/CapsDir/SubDir/Def.txt (glob) |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
204 |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
205 $ hg add capsdir1 |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
206 adding CapsDir1/CapsDir/AbC.txt (glob) |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
207 adding CapsDir1/CapsDir/SubDir/Def.txt (glob) |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
208 |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
209 $ 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
|
210 |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
211 $ 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
|
212 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
|
213 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
|
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 files capsdir1/capsdir |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
216 CapsDir1/CapsDir/AbC.txt (glob) |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
217 CapsDir1/CapsDir/SubDir/Def.txt (glob) |
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 $ 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
|
220 $ 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
|
221 |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
222 $ hg revert -r '.^' capsdir1/capsdir |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
223 reverting CapsDir1/CapsDir/SubDir/Def.txt (glob) |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
224 |
24807
fff8b779e63a
test-add.t: fix output difference between Windows and OS X (issue4603)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24790
diff
changeset
|
225 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
|
226 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
|
227 $ 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
|
228 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
|
229 --- a/CapsDir1/CapsDir/SubDir/Def.txt Thu Jan 01 00:00:00 1970 +0000 |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
230 +++ b/CapsDir1/CapsDir/SubDir/Def.txt * +0000 (glob) |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
231 @@ -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
|
232 -xyz |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
233 +def |
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
234 |
26000
9ac4e81b9659
match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25762
diff
changeset
|
235 $ 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
|
236 moving CapsDir1/CapsDir/AbC.txt to CapsDir1/CapsDir/ABC.txt (glob) |
9ac4e81b9659
match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25762
diff
changeset
|
237 $ 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
|
238 |
9ac4e81b9659
match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25762
diff
changeset
|
239 $ 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
|
240 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
|
241 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
|
242 |
24790
baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24548
diff
changeset
|
243 $ 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
|
244 $ hg remove -f 'glob:**.txt' -I capsdir1/capsdir |
26000
9ac4e81b9659
match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25762
diff
changeset
|
245 removing CapsDir1/CapsDir/ABC.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
|
246 removing CapsDir1/CapsDir/SubDir/Def.txt (glob) |
24537
2bb13f2b778c
dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23258
diff
changeset
|
247 #endif |
2bb13f2b778c
dirstate: don't require exact case when adding dirs on icasefs (issue4578)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23258
diff
changeset
|
248 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16875
diff
changeset
|
249 $ cd .. |