Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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 Thomas Arendsen Hein <thomas@intevation.de>
Tue, 02 May 2006 18:44:02 +0200
changeset 2175 b2ae81a7df29
parent 1809 ef53d200df3d
child 3252 c9cd63a6fce9
permissions -rw-r--r--
Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1202
71111d796e40 Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1198
diff changeset 
     1
 
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 
     2
 
transaction abort!
71111d796e40 Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1198
diff changeset 
     3
 
rollback completed
71111d796e40 Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1198
diff changeset 
     4
 
abort: invalid date: '1\t15.1'
1198
66f7d3946109 Add test output.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     5
 
transaction abort!
66f7d3946109 Add test output.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     6
 
rollback completed
1202
71111d796e40 Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1198
diff changeset 
     7
 
abort: invalid date: 'foo bar'
1198
66f7d3946109 Add test output.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     8
 
transaction abort!
66f7d3946109 Add test output.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     9
 
rollback completed
1202
71111d796e40 Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1198
diff changeset 
    10
 
abort: invalid date: ' 1 4444'
1198
66f7d3946109 Add test output.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    11
 
transaction abort!
66f7d3946109 Add test output.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    12
 
rollback completed
1202
71111d796e40 Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1198
diff changeset 
    13
 
abort: date exceeds 32 bits: 111111111111
1809
ef53d200df3d Updated test-commit to match changed output caused by nested transactions.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1488
diff changeset 
    14
 
transaction abort!
ef53d200df3d Updated test-commit to match changed output caused by nested transactions.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1488
diff changeset 
    15
 
rollback completed
1488
08c7851969cc only files in normal state should be marked as deleted
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1202
diff changeset 
    16
 
abort: No such file or directory: .../test/bar
mercurial-crew-with-dirclash