annotate tests/test-commit.out @ 3295:764688cf51e5

merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 19:57:45 -0500
parents c9cd63a6fce9
children a2d93b186a0e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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
3252
c9cd63a6fce9 Add documentation about the date formats allowed in the command line
Jose M. Prieto <jmprieto@gmx.net>
parents: 1809
diff changeset
4 abort: invalid date: '1\t15.1' see hg(1) manual page for details
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
3252
c9cd63a6fce9 Add documentation about the date formats allowed in the command line
Jose M. Prieto <jmprieto@gmx.net>
parents: 1809
diff changeset
7 abort: invalid date: 'foo bar' see hg(1) manual page for details
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
3252
c9cd63a6fce9 Add documentation about the date formats allowed in the command line
Jose M. Prieto <jmprieto@gmx.net>
parents: 1809
diff changeset
10 abort: invalid date: ' 1 4444' see hg(1) manual page for details
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