author | Matt Mackall <mpm@selenic.com> |
Tue, 22 Jul 2008 13:03:15 -0500 | |
changeset 6823 | 12081ea61a34 |
parent 6386 | bae2e9c838e9 |
child 6932 | d557749c627a |
permissions | -rw-r--r-- |
3709
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
1 |
% commit date test |
4970
30d4d8985dd8
transactions: avoid late tear-down (issue641)
Matt Mackall <mpm@selenic.com>
parents:
4256
diff
changeset
|
2 |
transaction abort! |
30d4d8985dd8
transactions: avoid late tear-down (issue641)
Matt Mackall <mpm@selenic.com>
parents:
4256
diff
changeset
|
3 |
rollback completed |
5757
c5793dada959
Clarify some messages during commit:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5754
diff
changeset
|
4 |
abort: empty commit message |
1202
71111d796e40
Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1198
diff
changeset
|
5 |
abort: impossible time zone offset: 4444444 |
3810 | 6 |
abort: invalid date: '1\t15.1' |
7 |
abort: invalid date: 'foo bar' |
|
6139
989467e8e3a9
Fix bad behaviour when specifying an invalid date (issue700)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6112
diff
changeset
|
8 |
abort: date exceeds 32 bits: 111111111111 |
6110
81e20e01d465
status: put added files that have disappeared in the deleted list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5757
diff
changeset
|
9 |
% commit added file that has been deleted |
81e20e01d465
status: put added files that have disappeared in the deleted list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5757
diff
changeset
|
10 |
nothing changed |
6112
5ffa962783c4
cmdutil.commit: use relative paths in the error messages
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6110
diff
changeset
|
11 |
abort: file bar not found! |
3786
8d603f8567ae
make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3709
diff
changeset
|
12 |
adding dir/file |
8d603f8567ae
make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3709
diff
changeset
|
13 |
dir/file |
8d603f8567ae
make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3709
diff
changeset
|
14 |
adding dir.file |
6112
5ffa962783c4
cmdutil.commit: use relative paths in the error messages
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6110
diff
changeset
|
15 |
abort: no match under directory dir! |
5ffa962783c4
cmdutil.commit: use relative paths in the error messages
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6110
diff
changeset
|
16 |
abort: no match under directory .! |
5ffa962783c4
cmdutil.commit: use relative paths in the error messages
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6110
diff
changeset
|
17 |
abort: no match under directory ../dir2! |
3786
8d603f8567ae
make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3709
diff
changeset
|
18 |
dir/file |
8d603f8567ae
make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3709
diff
changeset
|
19 |
does-not-exist: No such file or directory |
6112
5ffa962783c4
cmdutil.commit: use relative paths in the error messages
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6110
diff
changeset
|
20 |
abort: file does-not-exist not found! |
5ffa962783c4
cmdutil.commit: use relative paths in the error messages
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6110
diff
changeset
|
21 |
abort: file baz not tracked! |
5ffa962783c4
cmdutil.commit: use relative paths in the error messages
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6110
diff
changeset
|
22 |
abort: file quux not tracked! |
3786
8d603f8567ae
make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3709
diff
changeset
|
23 |
dir/file |
3709
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
24 |
% partial subdir commit test |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
25 |
adding bar/bar |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
26 |
adding foo/foo |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
27 |
% subdir log 1 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
28 |
changeset: 0:6ef3cb06bb80 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
29 |
user: test |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
30 |
date: Mon Jan 12 13:46:40 1970 +0000 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
31 |
files: foo/foo |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
32 |
description: |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
33 |
commit-subdir-1 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
34 |
|
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
35 |
|
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
36 |
% subdir log 2 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
37 |
changeset: 1:f2e51572cf5a |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
38 |
tag: tip |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
39 |
user: test |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
40 |
date: Mon Jan 12 13:46:41 1970 +0000 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
41 |
files: bar/bar |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
42 |
description: |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
43 |
commit-subdir-2 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
44 |
|
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
45 |
|
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
46 |
% full log |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
47 |
changeset: 1:f2e51572cf5a |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
48 |
tag: tip |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
49 |
user: test |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
50 |
date: Mon Jan 12 13:46:41 1970 +0000 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
51 |
files: bar/bar |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
52 |
description: |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
53 |
commit-subdir-2 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
54 |
|
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
55 |
|
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
56 |
changeset: 0:6ef3cb06bb80 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
57 |
user: test |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
58 |
date: Mon Jan 12 13:46:40 1970 +0000 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
59 |
files: foo/foo |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
60 |
description: |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
61 |
commit-subdir-1 |
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
62 |
|
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3294
diff
changeset
|
63 |
|
4253
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
64 |
% dot and subdir commit test |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
65 |
% full log |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
66 |
changeset: 1:d9180e04fa8a |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
67 |
tag: tip |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
68 |
user: test |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
69 |
date: Sat Jan 24 03:33:20 1970 +0000 |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
70 |
files: foo/plain-file |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
71 |
description: |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
72 |
commit-foo-dot |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
73 |
|
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
74 |
|
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
75 |
changeset: 0:80b572aaf098 |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
76 |
user: test |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
77 |
date: Mon Jan 12 13:46:40 1970 +0000 |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
78 |
files: foo/plain-file |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
79 |
description: |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
80 |
commit-foo-subdir |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
81 |
|
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
82 |
|
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
83 |
% subdir log |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
84 |
changeset: 1:d9180e04fa8a |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
85 |
tag: tip |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
86 |
user: test |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
87 |
date: Sat Jan 24 03:33:20 1970 +0000 |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
88 |
summary: commit-foo-dot |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
89 |
|
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
90 |
changeset: 0:80b572aaf098 |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
91 |
user: test |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
92 |
date: Mon Jan 12 13:46:40 1970 +0000 |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
93 |
summary: commit-foo-subdir |
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3810
diff
changeset
|
94 |
|
6386
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6139
diff
changeset
|
95 |
adding a |
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6139
diff
changeset
|
96 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6139
diff
changeset
|
97 |
created new head |
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6139
diff
changeset
|
98 |
merging a |
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6139
diff
changeset
|
99 |
0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6139
diff
changeset
|
100 |
(branch merge, don't forget to commit) |
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6139
diff
changeset
|
101 |
% should fail because we are specifying a file name |
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6139
diff
changeset
|
102 |
abort: cannot partially commit a merge (do not specify files or patterns) |
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6139
diff
changeset
|
103 |
% should fail because we are specifying a pattern |
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6139
diff
changeset
|
104 |
abort: cannot partially commit a merge (do not specify files or patterns) |
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6139
diff
changeset
|
105 |
% should succeed |