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

  • Committer: Olaf Conradi
  • Date: 2006-03-23 23:00:08 UTC
  • mto: (1661.1.1 bzr.mbp.remember)
  • mto: This revision was merged to the branch mainline in revision 1663.
  • Revision ID: olaf@conradi.org-20060323230008-8553da6ea86bf149
Added testcase for bzr merge --remember.
Changed branch.set_parent() to accepts None to remove parent.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1103
1103
        # FIXUP this and get_parent in a future branch format bump:
1104
1104
        # read and rewrite the file, and have the new format code read
1105
1105
        # using .get not .get_utf8. RBC 20060125
1106
 
        self.control_files.put_utf8('parent', url + '\n')
 
1106
        if url is None:
 
1107
            self.control_files._transport.delete('parent')
 
1108
        else:
 
1109
            self.control_files.put_utf8('parent', url + '\n')
1107
1110
 
1108
1111
    def tree_config(self):
1109
1112
        return TreeConfig(self)