/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: Robert Collins
  • Author(s): Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
  • Date: 2009-04-07 05:42:28 UTC
  • mto: This revision was merged to the branch mainline in revision 4261.
  • Revision ID: robertc@robertcollins.net-20090407054228-zslrfatxy9nw231i
Groupcompress from brisbane-core.

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):