← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-19 16:56:09 UTC
  • mto: This revision was merged to the branch mainline in revision 5900.
  • Revision ID: john@arbash-meinel.com-20110519165609-qwzdw66eywc2zh5c
Note to jam: when you finish debugging, remove your silly pdb statements

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
1771
1771
        for old_path, new_path, file_id, new_details in changes:
1772
1772
            # the entry for this file_id must be in tree 0.
1773
1773
            entry = self._get_entry(1, file_id, new_path)
1774
 
            if entry[0] is None or entry[1][1][0] == 'a':
 
1774
            if entry[0] is None or entry[1][1][0] in 'ar':
1775
1775
                self._raise_invalid(new_path, file_id,
1776
1776
                    'changed entry considered not present')
1777
 
            if entry[1][1][0] == 'r':
1778
 
                import pdb; pdb.set_trace()
1779
1777
            entry[1][1] = new_details
1780
1778
 
1781
1779
    def _update_basis_apply_deletes(self, deletes):
1851
1849
            for child_entry in dir_block:
1852
1850
                child_basis_kind = child_entry[1][1][0]
1853
1851
                if child_basis_kind not in 'ar':
1854
 
                    import pdb; pdb.set_trace()
1855
1852
                    self._raise_invalid(old_path, file_id,
1856
1853
                        "The file id was deleted but its children were "
1857
1854
                        "not deleted.")
3775
3772
            raise AssertionError("don't know how to compare "
3776
3773
                "source_minikind=%r, target_minikind=%r"
3777
3774
                % (source_minikind, target_minikind))
3778
 
            ## import pdb;pdb.set_trace()
3779
3775
        return None, None
3780
3776
 
3781
3777
    def __iter__(self):