Mercurial > hg
view tests/test-confused-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 | a514c7509fa9 |
line wrap: on
line source
%%% should show a removed and b added A b R a reverting... forgetting b undeleting a %%% should show b unknown and a back to normal ? b ? b.orig merging a %%% should show foo-b foo-b %%% should show a removed and b added A b R a ? b.orig reverting... forgetting b undeleting a %%% should show b unknown and a marked modified (merged) ? b ? b.orig %%% should show foo-b foo-b