← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: INADA Naoki
  • Date: 2011-05-18 06:27:34 UTC
  • mfrom: (5887 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5894.
  • Revision ID: songofacandy@gmail.com-20110518062734-1ilhll0rrqyyp8um
merge from lp:bzr and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
129
129
        push_result.target_branch = br_to
130
130
        push_result.old_revid = _mod_revision.NULL_REVISION
131
131
        push_result.old_revno = 0
132
 
        if br_from.get_push_location() is None or remember:
 
132
        # Remembers if asked explicitly or no previous location is set
 
133
        if (remember
 
134
            or (remember is None and br_from.get_push_location() is None)):
133
135
            br_from.set_push_location(br_to.base)
134
136
    else:
135
137
        if stacked_on is not None: