← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-14 07:26:43 UTC
  • mfrom: (5151.1.1 update)
  • Revision ID: pqm@pqm.ubuntu.com-20100414072643-kxva2lpej0ck8m4d
(robertc) Do not warn when updating if a pending merge was merged into
 trunk. (Robert Collins, bug 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: