← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2006-04-13 23:03:17 UTC
  • mfrom: (1661.1.1 bzr.mbp.remember)
  • mto: This revision was merged to the branch mainline in revision 1663.
  • Revision ID: mbp@sourcefrog.net-20060413230317-a1543afe041b1266
[merge] push/pull/merge --remember

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1150
1150
        # FIXUP this and get_parent in a future branch format bump:
1151
1151
        # read and rewrite the file, and have the new format code read
1152
1152
        # using .get not .get_utf8. RBC 20060125
1153
 
        self.control_files.put_utf8('parent', url + '\n')
 
1153
        if url is None:
 
1154
            self.control_files._transport.delete('parent')
 
1155
        else:
 
1156
            self.control_files.put_utf8('parent', url + '\n')
1154
1157
 
1155
1158
    def tree_config(self):
1156
1159
        return TreeConfig(self)