Viewing all changes in revision 3249.3.2.
- Committer: John Arbash Meinel
- Date: 2008-03-14 16:13:25 UTC
- mto: This revision was merged to the branch mainline in revision 3279.
- Revision ID: john@arbash-meinel.com-20080314161325-3cxcyg5nerrbimt2
review feedback from Robert
Use clearer variable names
profile the 'assert' section, which seemed to cost about 20% of the
time spent in find_sync_regions. (which is about 50% of merge_lines).
It seems the big overhead is actually iter_merge3(). So for now,
leave the asserts in, -O will remove them anyway.
Use clearer variable names
profile the 'assert' section, which seemed to cost about 20% of the
time spent in find_sync_regions. (which is about 50% of merge_lines).
It seems the big overhead is actually iter_merge3(). So for now,
leave the asserts in, -O will remove them anyway.
- files modified:
- bzrlib/merge3.py
expand all
collapse all
added
removed
