← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

  • Committer: John Arbash Meinel
  • Date: 2008-04-30 22:18:14 UTC
  • mto: This revision was merged to the branch mainline in revision 3407.
  • Revision ID: john@arbash-meinel.com-20080430221814-32fn9bgqi2t5psj6
Ian's first review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
49
49
        tree2 = tree.bzrdir.clone('b').open_workingtree()
50
50
        tree.commit('commit 2', timestamp=1196796819, timezone=0)
51
51
        tree2.commit('commit 2b', timestamp=1196796819, timezone=0)
52
 
        tree3 = tree.bzrdir.clone('c').open_workingtree()
 
52
        tree3 = tree2.bzrdir.clone('c').open_workingtree()
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)
60
60
            show_pending_merges(tree, output)
61
61
        finally:
62
62
            tree.unlock()
63
 
        # Even though 2b is merged by 3c also, it should only be displayed
64
 
        # the first time it shows u.
 
63
        # Even though 2b is in the ancestry of 3c, it should only be displayed
 
64
        # under the first merge parent.
65
65
        self.assertEqual('pending merges:\n'
66
66
                         '  Joe Foo 2007-12-04 commit 3b\n'
67
67
                         '    Joe Foo 2007-12-04 commit 2b\n'