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

  • Committer: John Arbash Meinel
  • Date: 2010-08-02 21:31:15 UTC
  • mto: (5050.17.11 2.2)
  • mto: This revision was merged to the branch mainline in revision 5419.
  • Revision ID: john@arbash-meinel.com-20100802213115-a2x1bdjcze9iwwdb
Fix a bug in update_minimal.

If the _maybe_remove_row actually removes a row, then we can't
be positive that our pointer is still correct.
In fact, in this test it is wrong, and leads to an incorrectly
sorted dirstate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
78
78
    branch_format = control.find_branch_format()
79
79
    if branch_format.get_reference(control) is not None:
80
80
        # Lightweight checkout: update the branch reference
81
 
        branch_format.set_reference(control, to_branch)
 
81
        branch_format.set_reference(control, None, to_branch)
82
82
    else:
83
83
        b = control.open_branch()
84
84
        bound_branch = b.get_bound_location()