← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Robey Pointer
  • Date: 2006-09-08 18:52:17 UTC
  • mfrom: (1993 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060908185217-6a4406e1d41753f5
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
40
40
 
41
41
        pending_merges = []
42
42
        if tree is not None:
43
 
            pending_merges = tree.pending_merges()
 
43
            pending_merges = tree.get_parent_ids()[1:]
44
44
 
45
45
        master = branch.get_master_branch()
46
46
        if master is not None: