tests/test-merge3
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 01 Apr 2006 11:58:50 +0200
changeset 2036 c9226bcc288d
parent 1933 7544700fd931
permissions -rwxr-xr-x
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)

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "1000000 0"