comparison tests/test-merge-revert.out @ 2036:c9226bcc288d

Don't abort when backup files already exist. Don't allow alternative names. Rationale: - When the user wants to revert, he shouldn't be stopped from doing this just because some old backups will be overwritten. - To not clobber important files by accident, alternative names for backup files were disabled. As the backup target now has a fixed name, the user doesn't have to be informed about the backup copy (unless --verbose)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 01 Apr 2006 11:58:50 +0200
parents 8d9ec30d58bc
children b2ae81a7df29
comparison
equal deleted inserted replaced
2030:8d9ec30d58bc 2036:c9226bcc288d
1 1:016807e6fdaf 1 1:016807e6fdaf
2 0:eb43f19ff115 2 0:eb43f19ff115
3 016807e6fdaf tip 3 016807e6fdaf tip
4 eb43f19ff115 4 eb43f19ff115
5 eb43f19ff115+ 5 eb43f19ff115+
6 saving current version of file1 as file1.orig
7 reverting file1 6 reverting file1
8 ? file1.orig 7 ? file1.orig
9 eb43f19ff115 8 eb43f19ff115
10 ? file1.orig 9 ? file1.orig
11 016807e6fdaf tip 10 016807e6fdaf tip