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

Committer: Robert Collins
Date: 2006-03-09 02:37:01 UTC
mfrom: (1600 +trunk)
mto: (1603.1.1 integration) (1607.1.2 integration) (1615.1.2 bzr.mbp.integration)
mto: This revision was merged to the branch mainline in revision 1601.
Revision ID: robertc@robertcollins.net-20060309023701-bac4fa080616d3f7

Merge bzr.dev

files modified:
bzrlib/branch.py

bzrlib/builtins.py

bzrlib/config.py

bzrlib/conflicts.py

bzrlib/merge.py

bzrlib/repository.py

bzrlib/tests/test_config.py

bzrlib/tests/test_merge.py

bzrlib/tests/workingtree_implementations/test_workingtree.py

bzrlib/transform.py

bzrlib/workingtree.py

Show diffs side-by-side

added added

removed removed

bzrlib/transform.py

1011

1011

return interesting_ids is None or file_id in interesting_ids

1012

1012

1013

1013

tt = TreeTransform(working_tree, pb)

1014

merge_modified = working_tree.merge_modified()

1015

1014

try:

1015

merge_modified = working_tree.merge_modified()

1016

1016

trans_id = {}

1017

1017

def trans_id_file_id(file_id):

1018

1018

try:

Older »