Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-commit.out
author Matt Mackall <mpm@selenic.com>
Tue, 08 May 2007 02:59:13 -0500
changeset 4416 bb1800a7d7e1
parent 3810 1d571ed26eed
child 4002 d7b9ec589546
child 4253 9e3e975258a9
permissions -rw-r--r--
merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.
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
1202
71111d796e40 Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1198
diff changeset 
     2
 
abort: impossible time zone offset: 4444444
71111d796e40 Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1198
diff changeset 
     3
 
transaction abort!
71111d796e40 Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1198
diff changeset 
     4
 
rollback completed
3810
1d571ed26eed Update tests
Matt Mackall <mpm@selenic.com>
parents: 3786
diff changeset 
     5
 
abort: invalid date: '1\t15.1'
1198
66f7d3946109 Add test output.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     6
 
transaction abort!
66f7d3946109 Add test output.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     7
 
rollback completed
3810
1d571ed26eed Update tests
Matt Mackall <mpm@selenic.com>
parents: 3786
diff changeset 
     8
 
abort: invalid date: 'foo bar'
1198
66f7d3946109 Add test output.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     9
 
transaction abort!
66f7d3946109 Add test output.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    10
 
rollback completed
3810
1d571ed26eed Update tests
Matt Mackall <mpm@selenic.com>
parents: 3786
diff changeset 
    11
 
nothing changed
3709
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset 
    12
 
% partial commit test
3294
a2d93b186a0e commit: unify file-level commit code
Matt Mackall <mpm@selenic.com>
parents: 3257
diff changeset 
    13
 
trouble committing bar!
1488
08c7851969cc only files in normal state should be marked as deleted
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1202
diff changeset 
    14
 
abort: No such file or directory: .../test/bar
3786
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    15
 
adding dir/file
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    16
 
dir/file
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    17
 
adding dir.file
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    18
 
abort: no match under directory .../test/dir!
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    19
 
abort: no match under directory .../test/bleh!
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    20
 
abort: no match under directory .../test/dir2!
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    21
 
dir/file
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    22
 
does-not-exist: No such file or directory
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    23
 
abort: file .../test/does-not-exist not found!
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    24
 
baz: unsupported file type (type is symbolic link)
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    25
 
abort: can't commit .../test/baz: unsupported file type!
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    26
 
abort: file .../test/quux not tracked!
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset 
    27
 
dir/file
3709
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset 
    28
 
% 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 
    29
 
adding bar/bar
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset 
    30
 
adding foo/foo
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset 
    31
 
% subdir log 1
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset 
    32
 
changeset:   0:6ef3cb06bb80
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset 
    33
 
user:        test
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset 
    34
 
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 
    35
 
files:       foo/foo
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset 
    36
 
description:
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3294
diff changeset 
    37
 
commit-subdir-1
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














38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    40


% subdir log 2












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    41


changeset:   1:f2e51572cf5a












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    42


tag:         tip












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    43


user:        test












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    44


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




    45


files:       bar/bar












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    46


description:












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    47


commit-subdir-2












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














38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    50


% full log












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    51


changeset:   1:f2e51572cf5a












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    52


tag:         tip












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    53


user:        test












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    54


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




    55


files:       bar/bar












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    56


description:












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    57


commit-subdir-2












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














38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    60


changeset:   0:6ef3cb06bb80












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    61


user:        test












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    62


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




    63


files:       foo/foo












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    64


description:












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    65


commit-subdir-1












38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    66














38291d9c8c1c
Expand test-commit to cover one of the recent bugs.



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 
3294

diff
changeset




    67
















mercurial