[PATCH] backup file support for merge-revert

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

Building on my "Use merge3 for text merging" patches, these patches
1. update the test suite to properly test diff3 merges
2. add support for backing up files prior to performing merges

In the theoretically-impossible case of a text conflict, you'll get many
files:
foo (file with changes and conflict markers)
foo~
foo.BASE
foo.THIS (identical to foo~)
foo.OTHER

However, if anyone can get revert to produce a text conflict, I will be
utterly shocked.

It would be nice to use a different convention for naming backup files,
because files with ~ are ignored by default, so they don't show up in
'bzr status'.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFC6Squ0F+nu1YWqI0RAve0AJ4uDfAuEMX9TEMnaTO0XZc6EOrstACbBh0S
qqcoJ3hPz7vAEKUOSzP+HcE=
=AQdl
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mf-tests.patch
Type: text/x-patch
Size: 6531 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050728/6b69ede5/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-revert-backups.patch
Type: text/x-patch
Size: 6505 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050728/6b69ede5/attachment-0001.bin