[MERGE REVIEW]

[Aaron Bentley]

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

Martin Pool wrote:
| On 09/04/2006, at 4:36 PM, Aaron Bentley wrote:
| Possibly this should be in blackbox/ since it's exercising the  command
| line interface, not directly the merge code itself.


Yes.  It's just that blackbox/test_merge.py doesn't exist in bzr.dev,
and I already have a patch pending that would create it.  So I didn't
want to create it twice.

| Do you think merge with interesting_files set is adequately tested in
| other places?

Yes, it's used by remerge, so I think it has pretty good coverage.

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

iD8DBQFEOd+90F+nu1YWqI0RAqgUAJwPEMxKzEMejR4S6Lsx0aeoKmtweACggeAK
tdStoFZ4LeJ6D2/BS7p2Bqg=
=RXSa
-----END PGP SIGNATURE-----