tests/test-commit.out
author David Soria Parra <dsp@php.net>
Sun, 07 Dec 2008 08:47:02 +0100
changeset 7485 ecfb683675ed
parent 7072 4e0d54fbd34f
child 8496 a21605de1509
permissions -rw-r--r--
Merge bookmarks
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
1d571ed26eed Update tests
Matt Mackall <mpm@selenic.com>
parents: 3786
diff changeset
     6
abort: invalid date: '1\t15.1' 
1d571ed26eed Update tests
Matt Mackall <mpm@selenic.com>
parents: 3786
diff changeset
     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
6935
03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents: 6934
diff changeset
    14
committed changeset 2:d2a76177cb42
3786
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset
    15
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
    16
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
    17
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
    18
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
    19
dir/file
6935
03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents: 6934
diff changeset
    20
committed changeset 3:1cd62a2d8db5
3786
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset
    21
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
    22
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
    23
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
    24
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
    25
dir/file
6935
03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents: 6934
diff changeset
    26
committed changeset 4:49176991390e
3709
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    27
% 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
    28
adding bar/bar
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    29
adding foo/foo
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    30
% subdir log 1
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    31
changeset:   0:6ef3cb06bb80
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    32
user:        test
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    33
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
    34
files:       foo/foo
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    35
description:
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    36
commit-subdir-1
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    37
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    38
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    39
% subdir log 2
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    40
changeset:   1:f2e51572cf5a
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    41
tag:         tip
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    42
user:        test
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    43
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
    44
files:       bar/bar
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    45
description:
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    46
commit-subdir-2
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    47
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    48
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    49
% full log
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    50
changeset:   1:f2e51572cf5a
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    51
tag:         tip
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    52
user:        test
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    53
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
    54
files:       bar/bar
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    55
description:
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    56
commit-subdir-2
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    57
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    58
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    59
changeset:   0:6ef3cb06bb80
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    60
user:        test
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    61
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
    62
files:       foo/foo
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    63
description:
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    64
commit-subdir-1
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    65
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset
    66
4253
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    67
% 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
    68
% full log
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    69
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
    70
tag:         tip
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    71
user:        test
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    72
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
    73
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
    74
description:
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    75
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
    76
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    77
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    78
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
    79
user:        test
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    80
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
    81
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
    82
description:
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    83
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
    84
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    85
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    86
% subdir log
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    87
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
    88
tag:         tip
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    89
user:        test
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    90
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
    91
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
    92
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    93
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
    94
user:        test
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3810
diff changeset
    95
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
    96
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
    97
6386
bae2e9c838e9 Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents: 6139
diff changeset
    98
adding a
bae2e9c838e9 Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents: 6139
diff changeset
    99
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
   100
created new head
bae2e9c838e9 Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents: 6139
diff changeset
   101
merging a
bae2e9c838e9 Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents: 6139
diff changeset
   102
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
   103
(branch merge, don't forget to commit)
bae2e9c838e9 Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents: 6139
diff changeset
   104
% should fail because we are specifying a file name
bae2e9c838e9 Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents: 6139
diff changeset
   105
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
   106
% should fail because we are specifying a pattern
bae2e9c838e9 Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents: 6139
diff changeset
   107
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
   108
% should succeed
7072
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   109
% test commit message content
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   110
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   111
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   112
HG: Enter commit message.  Lines beginning with 'HG:' are removed.
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   113
HG: --
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   114
HG: user: test
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   115
HG: branch 'default'
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   116
HG: added added
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   117
HG: changed changed
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   118
HG: removed removed
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   119
transaction abort!
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   120
rollback completed
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   121
abort: empty commit message