/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/uncommit.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-09 15:39:00 UTC
  • mfrom: (1993 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1995.
  • Revision ID: john@arbash-meinel.com-20060909153900-a7d8b960eaac71d6
[merge] bzr.dev 1993

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: