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 foo > a
hg add a
hg commit -m "1" -d "1000000 0"
echo bar > b
hg add b
hg remove a
echo "%%% should show a removed and b added"
hg status
echo "reverting..."
hg revert
echo "%%% should show b unknown and a back to normal"
hg status
rm b
hg co -C 0
echo foo-a > a
hg commit -m "2a" -d "1000000 0"
hg co -C 0
echo foo-b > a
hg commit -m "2b" -d "1000000 0"
HGMERGE=true hg update -m 1
echo "%%% should show foo-b"
cat a
echo bar > b
hg add b
rm a
hg remove a
echo "%%% should show a removed and b added"
hg status
echo "reverting..."
hg revert
echo "%%% should show b unknown and a marked modified (merged)"
hg status
echo "%%% should show foo-b"
cat a