/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

  • Committer: Vincent Ladeuil
  • Date: 2009-08-26 09:06:02 UTC
  • mto: (4651.1.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4653.
  • Revision ID: v.ladeuil+lp@free.fr-20090826090602-uu9vapyw6yhbz6ak
Catch up fix for #347649.

* bzrlib/tests/blackbox/test_filesystem_cicp.py:
(TestMisc.test_status): status display parents if modified

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
53
53
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
54
54
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
55
55
        tree.merge_from_branch(tree2.branch)
56
 
        tree.merge_from_branch(tree3.branch, force=True)
 
56
        tree.merge_from_branch(tree3.branch)
57
57
        return tree
58
58
 
59
59
    def test_multiple_pending(self):