~bzr/bzr/375898-missing-merged-root

Viewing all changes in revision 5119.

  • Committer: Vincent Ladeuil
  • Date: 2010-03-29 12:07:26 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20100329120726-nuqbdx9emj8mly4e
Reproduce bug #373898.

* bzrlib/tests/per_workingtree/test_merge_from_branch.py:
(TestMergeFromBranch.test_merge_type): Smallest test reproducing
bug #373898, after an independant branch has been merged, renaming
a file from the imported root and then deleted it triggers the
tree transform bug.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: