← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-16 02:26:44 UTC
  • mfrom: (2017 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2020.
  • Revision ID: john@arbash-meinel.com-20060916022644-e19857e642b00a9e
[merge] bzr.dev 2017

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
827
827
        tree = WorkingTree.open_containing(dir)[0]
828
828
        tree.lock_write()
829
829
        try:
830
 
            existing_pending_merges = tree.pending_merges()
 
830
            existing_pending_merges = tree.get_parent_ids()[1:]
831
831
            last_rev = tree.last_revision()
832
832
            if last_rev == tree.branch.last_revision():
833
833
                # may be up to date, check master too.
839
839
            conflicts = tree.update()
840
840
            revno = tree.branch.revision_id_to_revno(tree.last_revision())
841
841
            note('Updated to revision %d.' % (revno,))
842
 
            if tree.pending_merges() != existing_pending_merges:
 
842
            if tree.get_parent_ids()[1:] != existing_pending_merges:
843
843
                note('Your local commits will now show as pending merges with '
844
844
                     "'bzr status', and can be committed with 'bzr commit'.")
845
845
            if conflicts != 0: