Viewing all changes in revision 1185.33.23.
- Committer: Martin Pool
- Date: 2005-11-16 07:47:03 UTC
- mto: (1185.74.1 bzr.dev (Main development branch)) (1505.1.18 bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
- mto: This revision was merged to the branch mainline in revision 1509.
- Revision ID: mbp@sourcefrog.net-20051116074703-03f47cbe4a4f1e43
Add test for merging metadata change vs file deletion
(currently passes but should fail)
(currently passes but should fail)
- files modified:
- bzrlib/selftest/test_merge_core.py
expand all
collapse all
added
removed
