##// END OF EJS Templates
abort when merging two heads and repository has local changes
abort when merging two heads and repository has local changes

File last commit:

r1488:08c78519 default
r1581:db10b711 default
Show More
test-commit.out
16 lines | 416 B | text/plain | TextLexer
Bryan O'Sullivan
Add test output.
r1198 transaction abort!
rollback completed
Bryan O'Sullivan
Commit date validation: more stringent checks, more useful error messages.
r1202 abort: impossible time zone offset: 4444444
transaction abort!
rollback completed
abort: invalid date: '1\t15.1'
Bryan O'Sullivan
Add test output.
r1198 transaction abort!
rollback completed
Bryan O'Sullivan
Commit date validation: more stringent checks, more useful error messages.
r1202 abort: invalid date: 'foo bar'
Bryan O'Sullivan
Add test output.
r1198 transaction abort!
rollback completed
Bryan O'Sullivan
Commit date validation: more stringent checks, more useful error messages.
r1202 abort: invalid date: ' 1 4444'
Bryan O'Sullivan
Add test output.
r1198 transaction abort!
rollback completed
Bryan O'Sullivan
Commit date validation: more stringent checks, more useful error messages.
r1202 abort: date exceeds 32 bits: 111111111111
Benoit Boissinot
only files in normal state should be marked as deleted...
r1488 abort: No such file or directory: .../test/bar