« back to all changes in this revision
Viewing changes to bzrlib/_dirstate_helpers_c.h
- Committer: John Arbash Meinel
- Date: 2008-07-11 21:41:24 UTC
- mto: This revision was merged to the branch mainline in revision 3543.
- Revision ID: john@arbash-meinel.com-20080711214124-qi09irlj7pd5cuzg
Shortcut the case when one revision is in the ancestry of the other.
At the cost of a heads() check, when one parent supersedes, we don't have to extract
the text for the other. Changes merge time from 3m37s => 3m21s. Using a
CachingParentsProvider would drop the time down to 3m11s.
At the cost of a heads() check, when one parent supersedes, we don't have to extract
the text for the other. Changes merge time from 3m37s => 3m21s. Using a
CachingParentsProvider would drop the time down to 3m11s.
- files added:
- tools/win32/survey.txt
- files removed:
- bzrlib/_btree_serializer_c.pyx
- bzrlib/plugins/netrc_credential_store
- bzrlib/plugins/netrc_credential_store/tests
- bzrlib/tests/ssl_certs
- bzrlib/transport/ftp
- tools/packaging
- files renamed:
- bzrlib/tests/per_repository/ => bzrlib/tests/repository_implementations/
- bzrlib/transport/ftp/__init__.py => bzrlib/transport/ftp.py
- files modified:
- .bzrignore
added
removed
bzrlib/_dirstate_helpers_c.h
