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

  • Committer: Robert Collins
  • Date: 2010-04-14 04:48:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5153.
  • Revision ID: robertc@robertcollins.net-20100414044800-wda5phry84h497pn
``bzr update`` when a pending merge in the working tree has been merged
into the master branch will no longer claim that old commits have become
pending merges. (Robert Collins, #562079)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1462
1462
            _mod_revision.ensure_null(tree.last_revision()))
1463
1463
        note('Updated to revision %s of branch %s' %
1464
1464
             ('.'.join(map(str, revno)), branch_location))
1465
 
        if tree.get_parent_ids()[1:] != existing_pending_merges:
 
1465
        parent_ids = tree.get_parent_ids()
 
1466
        if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1466
1467
            note('Your local commits will now show as pending merges with '
1467
1468
                 "'bzr status', and can be committed with 'bzr commit'.")
1468
1469
        if conflicts != 0: