~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/dirstate.py

Committer: Canonical.com Patch Queue Manager
Date: 2009-09-30 23:47:19 UTC
mfrom: (4634.58.2 2.0)
mto: (4634.64.1 integration-2.0) (4722.1.1 merge-2.0-into-dev) (4737.1.1 merge-2.0-into-devel) (4769.1.1 merge-2.0-into-devel) (4776.1.1 jam-integration) (4778.1.1 2.1.0b2) (4782.1.1 jam-integration) (4797.17.1 alias-loc-docs-337834-2.1) (4854.1.1 merge-2.0-into-devel) (4896.1.1 2.1.0b4-dev) (4899.1.1 jam-integration) (4927.1.1 merge-2.0-into-devel) (4931.1.2 jam-integration) (4932.1.1 2.1.0rc1-pyrex-propagation) (4946.1.1 2.1.0rc1-unregister-mem-trans) (4949.1.1 integration) (4953.1.1 jam-integration) (4957.1.1 jam-integration) (4964.1.1 integration) (4967.1.1 jam-integration) (4981.1.2 2.1.0rc1-dev) (4999.3.1 apport) (5051.4.1 376388-dot-bazaar-ownership) (5045.1.1 369501-version) (5346.4.1 cleanup) (5174.1.1 jam-integration) (5074.5.1 fix-523746-dev) (4668.1.4 2.1.0b2) (4734.2.2 2.1.0b1) (4746.1.2 start-2.1.0b2)
mto: This revision was merged to the branch mainline in revision 4723.
Revision ID: pqm@pqm.ubuntu.com-20090930234719-e7be1sy74sb42o1y

(robertc) Handle versioned objects that become FIFO and other
unversionable things. (Robert Collins, #438569)

added added

removed removed

3328

content_change = False

3329

target_exec = False

3330

else:

3331

raise Exception, "unknown kind %s" % path_info[2]

3331

if path is None:

3332

path = pathjoin(old_dirname, old_basename)

3333

raise errors.BadFileKindError(path, path_info[2])

3332

3334

if source_minikind == 'd':

3333

3335

if path is None:

3334

3336

old_path = path = pathjoin(old_dirname, old_basename)