Mercurial > hg > gitweb
annotate tests/testmergerevert.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 
rev  line source 

1933
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

1 1:016807e6fdaf 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

2 0:eb43f19ff115 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

3 016807e6fdaf tip 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

4 eb43f19ff115 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

5 eb43f19ff115+ 
2029
d436b21b20dc
rewrite revert command. fix issues 93, 123, 147.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset

6 reverting file1 
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset

7 ? file1.orig 
1933
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

8 eb43f19ff115 
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset

9 ? file1.orig 
1933
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

10 016807e6fdaf tip 
792
49ec802b4a16
Added tests for bug with threewaymerging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset

11 merging file1 
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset

12 ? file1.orig 
1933
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

13 016807e6fdaf tip 
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset

14 ? file1.orig 
1933
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

15 016807e6fdaf tip 
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset

16 ? file1.orig 
1933
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

17 016807e6fdaf tip 
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset

18 ? file1.orig 
1933
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

19 016807e6fdaf tip 